From aceae71dd03533efa04e9983c2bb9a220ba9eb76 Mon Sep 17 00:00:00 2001 From: grapebaba <281165273@qq.com> Date: Mon, 13 Nov 2023 18:28:15 +0800 Subject: [PATCH] feat:add op tx type Signed-off-by: grapebaba <281165273@qq.com> --- {.circleci => .circleci-nouse}/config.yml | 0 .github/actions/capture_test_logs/action.yml | 11 + .../actions/capture_test_results/action.yml | 26 ++ .github/actions/prepare/action.yml | 14 + .../actions/restore_gradle_cache/action.yml | 14 + .github/nightly.yml | 51 +++ .github/workflows/checks.yml | 6 +- .github/workflows/codeql.yml | 6 +- .github/workflows/dco-merge-group.yml | 2 +- .github/workflows/dco.yml | 2 +- .github/workflows/default.yml | 307 ++++++++++++++++++ .../workflows/gradle-wrapper-validation.yml | 2 +- .github/workflows/pr-checklist-on-open.yml | 4 +- .github/workflows/release.yml | 2 +- .github/workflows/repolinter.yml | 4 +- .github/workflows/sonarcloud.yml | 2 +- .../besu/datatypes/TransactionType.java | 5 +- .../hyperledger/besu/enclave/EnclaveTest.java | 2 + .../ethereum/core/BlockDataGenerator.java | 1 + .../ethereum/core/TransactionTestFixture.java | 2 + .../eth/transactions/PendingTransaction.java | 1 + 21 files changed, 449 insertions(+), 15 deletions(-) rename {.circleci => .circleci-nouse}/config.yml (100%) create mode 100644 .github/actions/capture_test_logs/action.yml create mode 100644 .github/actions/capture_test_results/action.yml create mode 100644 .github/actions/prepare/action.yml create mode 100644 .github/actions/restore_gradle_cache/action.yml create mode 100644 .github/nightly.yml create mode 100644 .github/workflows/default.yml diff --git a/.circleci/config.yml b/.circleci-nouse/config.yml similarity index 100% rename from .circleci/config.yml rename to .circleci-nouse/config.yml diff --git a/.github/actions/capture_test_logs/action.yml b/.github/actions/capture_test_logs/action.yml new file mode 100644 index 00000000000..f7b2a74a752 --- /dev/null +++ b/.github/actions/capture_test_logs/action.yml @@ -0,0 +1,11 @@ +name: capture_test_logs +description: "Capture test logs" +runs: + using: composite + steps: + - uses: actions/upload-artifact@v3.1.3 + with: + path: acceptance-tests/tests/build/acceptanceTestLogs + - uses: actions/upload-artifact@v3.1.3 + with: + path: acceptance-tests/tests/build/jvmErrorLogs \ No newline at end of file diff --git a/.github/actions/capture_test_results/action.yml b/.github/actions/capture_test_results/action.yml new file mode 100644 index 00000000000..f5e23e51873 --- /dev/null +++ b/.github/actions/capture_test_results/action.yml @@ -0,0 +1,26 @@ +name: capture_test_results +description: "Capture test results" +runs: + using: composite + steps: + - name: Jacoco + run: "./gradlew --no-daemon jacocoTestReport" + shell: bash + - name: Gather test results + run: |- + FILES=`find . -name test-results` + for FILE in $FILES + do + MODULE=`echo "$FILE" | sed -e 's@./\(.*\)/build/test-results@\1@'` + TARGET="build/test-results/$MODULE" + mkdir -p "$TARGET" + cp -rf ${FILE}/*/* "$TARGET" + done + if: always() + shell: bash + - uses: actions/upload-artifact@v3.1.3 + with: + path: build/test-results + - uses: actions/upload-artifact@v3.1.3 + with: + path: besu/build/reports/jacoco \ No newline at end of file diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml new file mode 100644 index 00000000000..265097087ba --- /dev/null +++ b/.github/actions/prepare/action.yml @@ -0,0 +1,14 @@ +name: prepare +description: "Prepare the environment for the build" +runs: + using: composite + steps: + - uses: actions/checkout@v4.1.0 + - name: Install Packages - LibSodium, nssdb + shell: bash + run: |- + sudo apt-get update + sudo apt-get install -y libsodium23 libsodium-dev libjemalloc-dev apt-transport-https haveged libnss3-tools + sudo service haveged restart + java --version + - uses: "./.github/actions/restore_gradle_cache" \ No newline at end of file diff --git a/.github/actions/restore_gradle_cache/action.yml b/.github/actions/restore_gradle_cache/action.yml new file mode 100644 index 00000000000..10d80b0de83 --- /dev/null +++ b/.github/actions/restore_gradle_cache/action.yml @@ -0,0 +1,14 @@ +name: restore_gradle_cache +description: "Restore the gradle cache" +runs: + using: composite + steps: + - name: restore_cache + uses: actions/cache@v3.3.2 + with: + key: deps-{{ checksum "gradle/versions.gradle" }}-{{ .Branch }}-{{ .Revision }} + path: UPDATE_ME + restore-keys: |- + deps-{{ checksum "gradle/versions.gradle" }}-{{ .Branch }}-{{ .Revision }} + deps-{{ checksum "gradle/versions.gradle" }} + deps- \ No newline at end of file diff --git a/.github/nightly.yml b/.github/nightly.yml new file mode 100644 index 00000000000..b497fbc28a9 --- /dev/null +++ b/.github/nightly.yml @@ -0,0 +1,51 @@ +#name: nightly +#on: +# schedule: +# - cron: 0 19 * * * +# # 'filters' was not transformed because there is no suitable equivalent in GitHub Actions +#jobs: +# assemble: +# runs-on: ubuntu-latest +# container: +# image: openjdk:17.0 +# steps: +# - uses: actions/checkout@v4.1.0 +# - uses: "./.github/actions/prepare" +# - name: Assemble +# run: "./gradlew --no-daemon clean compileJava compileTestJava assemble" +# - name: save_cache +# uses: actions/cache@v3.3.2 +# with: +# path: |- +# .gradle +# ~/.gradle +# key: deps-{{ checksum "gradle/versions.gradle" }}-{{ .Branch }}-{{ .Revision }} +# - uses: actions/upload-artifact@v3.1.3 +# with: +# path: "~/project/./" +# - uses: actions/upload-artifact@v3.1.3 +# with: +# path: build/distributions +# dockerScan: +# runs-on: ubuntu-latest +# container: +# image: docker:stable-git +# steps: +# - uses: actions/checkout@v4.1.0 +# - uses: "./.github/actions/restore_gradle_cache" +## # 'setup_remote_docker' was not transformed because there is no suitable equivalent in GitHub Actions +# - name: Install trivy +# run: |- +# 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 +# - name: Scan with trivy +# run: |- +# 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 +# shell: "/bin/sh" diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 9fdae30a99b..bb8f30bedf7 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -1,13 +1,13 @@ name: checks on: push: - branches: [ main ] + branches: [ release-23.10.x, main ] pull_request: workflow_dispatch: jobs: spotless: - runs-on: [besu-research-ubuntu-16] + runs-on: ubuntu-latest if: ${{ github.actor != 'dependabot[bot]' }} steps: - name: Checkout Repo @@ -21,7 +21,7 @@ jobs: - name: spotless run: ./gradlew --no-daemon --parallel clean spotlessCheck javadoc_17: - runs-on: [besu-research-ubuntu-8] + runs-on: ubuntu-latest if: ${{ github.actor != 'dependabot[bot]' }} steps: - name: Checkout Repo diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 100be39e0df..b2d27a98192 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,9 +13,9 @@ name: "CodeQL" on: push: - branches: [ main ] + branches: [ release-23.10.x, main ] pull_request: - branches: [ main ] + branches: [ release-23.10.x, main ] paths-ignore: - '**/*.json' - '**/*.md' @@ -24,7 +24,7 @@ on: jobs: analyze: name: Analyze - runs-on: [besu-research-ubuntu-16] + runs-on: ubuntu-latest permissions: actions: read contents: read diff --git a/.github/workflows/dco-merge-group.yml b/.github/workflows/dco-merge-group.yml index fee29b6c5d7..d47a16a6ccb 100644 --- a/.github/workflows/dco-merge-group.yml +++ b/.github/workflows/dco-merge-group.yml @@ -4,7 +4,7 @@ on: jobs: dco: - runs-on: [besu-research-ubuntu-8] + runs-on: ubuntu-latest if: ${{ github.actor != 'dependabot[bot]' }} steps: - run: echo "This DCO job runs on merge_queue event and doesn't check PR contents" diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml index 5fa9931c77a..4e5e70e18e6 100644 --- a/.github/workflows/dco.yml +++ b/.github/workflows/dco.yml @@ -5,7 +5,7 @@ on: jobs: dco: - runs-on: [besu-research-ubuntu-8] + runs-on: ubuntu-latest if: ${{ github.actor != 'dependabot[bot]' }} steps: - run: echo "This DCO job runs on pull_request event and workflow_dispatch" diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml new file mode 100644 index 00000000000..a45c22702a3 --- /dev/null +++ b/.github/workflows/default.yml @@ -0,0 +1,307 @@ +name: default +on: + push: + branches: + - release-23.10.x + - main + pull_request: +jobs: + assemble: + runs-on: ubuntu-latest + container: + image: cimg/openjdk:17.0 + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/prepare" + - name: Assemble + run: "./gradlew --no-daemon clean compileJava compileTestJava assemble" + - name: save_cache + uses: actions/cache@v3.3.2 + with: + path: |- + .gradle + ~/.gradle + key: deps-{{ checksum "gradle/versions.gradle" }}-{{ .Branch }}-{{ .Revision }} + - uses: actions/upload-artifact@v3.1.3 + with: + path: build/assemble + - uses: actions/upload-artifact@v3.1.3 + with: + path: build/distributions + unitTests: + runs-on: ubuntu-latest + container: + image: cimg/openjdk:17.0 + needs: + - assemble + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/prepare" + - uses: actions/download-artifact@v3.0.2 + with: + path: build/assemble + - name: Build + run: "./gradlew --no-daemon build" + - uses: "./.github/actions/capture_test_results" +# testWindows: +# runs-on: windows-latest +# needs: +# - assemble +# steps: +# - uses: actions/download-artifact@v3.0.2 +# with: +# path: build/assemble +# - name: Unzip Windows build +# run: |- +# cd build/distributions +# unzip besu-*.zip -d besu-tmp +# cd besu-tmp +# mv besu-* ../besu +# - name: Test Besu Windows executable +# run: |- +# build\distributions\besu\bin\besu.bat --help +# build\distributions\besu\bin\besu.bat --version + referenceTests: + runs-on: ubuntu-latest + container: + image: cimg/openjdk:17.0 + needs: + - assemble + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/prepare" + - uses: actions/download-artifact@v3.0.2 + with: + path: build/assemble + - name: ReferenceTests + run: |- + git submodule update --init --recursive + ./gradlew --no-daemon referenceTest + - uses: "./.github/actions/capture_test_results" + integrationTests: + runs-on: ubuntu-latest + container: + image: cimg/openjdk:17.0 + needs: + - assemble + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/prepare" + - uses: actions/download-artifact@v3.0.2 + with: + path: build/assemble + - name: IntegrationTests + run: "./gradlew --no-daemon integrationTest" + - name: CompileJmh + run: "./gradlew --no-daemon compileJmh" + - uses: "./.github/actions/capture_test_results" + acceptanceTests: + runs-on: ubuntu-latest + container: + image: cimg/openjdk:17.0 + needs: + - assemble + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/prepare" + - uses: actions/download-artifact@v3.0.2 + with: + path: build/assemble + - name: AcceptanceTests (Mainnet) + run: |- + ./gradlew --no-daemon acceptanceTestMainnet + - uses: "./.github/actions/capture_test_results" + - uses: "./.github/actions/capture_test_logs" + acceptanceTestsCliqueBft: + runs-on: ubuntu-latest + container: + image: cimg/openjdk:17.0 + needs: + - assemble + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/prepare" + - uses: actions/download-artifact@v3.0.2 + with: + path: build/assemble + - name: AcceptanceTests (Non-Mainnet) + run: |- + ./gradlew --no-daemon acceptanceTestCliqueBft + - uses: "./.github/actions/capture_test_results" + - uses: "./.github/actions/capture_test_logs" + acceptanceTestsPrivacy: + runs-on: ubuntu-latest + container: + image: cimg/openjdk:17.0 + needs: + - assemble + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/prepare" + - uses: actions/download-artifact@v3.0.2 + with: + path: build/assemble + - name: AcceptanceTests (Non-Mainnet) + run: |- + ./gradlew --no-daemon acceptanceTestPrivacy + - uses: "./.github/actions/capture_test_results" + - uses: "./.github/actions/capture_test_logs" + acceptanceTestsPermissioning: + runs-on: ubuntu-latest + container: + image: cimg/openjdk:17.0 + needs: + - assemble + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/prepare" + - uses: actions/download-artifact@v3.0.2 + with: + path: build/assemble + - name: AcceptanceTests (Non-Mainnet) + run: |- + ./gradlew --no-daemon acceptanceTestPermissioning + - uses: "./.github/actions/capture_test_results" + - uses: "./.github/actions/capture_test_logs" +# buildDocker: +# runs-on: ubuntu-latest +# container: +# image: cimg/openjdk:17.0 +# needs: +# - assemble +# steps: +# - uses: actions/checkout@v4.1.0 +# - uses: "./.github/actions/prepare" +# - uses: actions/download-artifact@v3.0.2 +# with: +# path: build/assemble +## # 'setup_remote_docker' was not transformed because there is no suitable equivalent in GitHub Actions +# - name: hadoLint_openjdk_17 +# run: docker run --rm -i hadolint/hadolint < docker/openjdk-17/Dockerfile +# - name: hadoLint_openjdk_17_debug +# run: docker run --rm -i hadolint/hadolint < docker/openjdk-17-debug/Dockerfile +# - name: hadoLint_openjdk_latest +# run: docker run --rm -i hadolint/hadolint < docker/openjdk-latest/Dockerfile +# - name: hadoLint_graalvm +# run: docker run --rm -i hadolint/hadolint < docker/graalvm/Dockerfile +# - name: build image +# run: "./gradlew --no-daemon distDocker" +# - name: test image +# run: |- +# mkdir -p docker/reports +# 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: +# runs-on: ubuntu-latest +# needs: +# - assemble +# steps: +# - uses: actions/checkout@v4.1.0 +# - uses: "./.github/actions/prepare" +# - uses: actions/download-artifact@v3.0.2 +# with: +# path: build/assemble +# - name: hadoLint_openjdk_17 +# run: docker run --rm -i hadolint/hadolint < docker/openjdk-17/Dockerfile +# - name: hadoLint_openjdk_latest +# run: docker run --rm -i hadolint/hadolint < docker/openjdk-latest/Dockerfile +# - name: hadoLint_graalvm +# run: docker run --rm -i hadolint/hadolint < docker/graalvm/Dockerfile +# - name: Java_17 +# run: |- +# sudo apt install -q --assume-yes openjdk-17-jre-headless openjdk-17-jdk-headless +# sudo update-java-alternatives -a +# - name: build image +# run: "./gradlew --no-daemon distDocker" +# - name: test image +# run: |- +# 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: +# if: # GitHub does not currently support regular expressions inside if conditions +## github.ref == 'refs/heads/main' || github.ref == 'refs/heads//^release-.*/' +# runs-on: ubuntu-latest +# container: +# image: cimg/openjdk:17.0 +# needs: +# - assemble +# - integrationTests +# - unitTests +# - acceptanceTests +# - referenceTests +# - buildDocker +# steps: +# - uses: actions/checkout@v4.1.0 +# - uses: "./.github/actions/prepare" +# - uses: actions/download-artifact@v3.0.2 +# with: +# path: "~/project" +# - name: Publish +# run: "./gradlew --no-daemon artifactoryPublish" +# publishDocker: +# if: # GitHub does not currently support regular expressions inside if conditions +## github.ref == 'refs/heads/main' || github.ref == 'refs/heads//^release-.*/' +# runs-on: ubuntu-latest +# container: +# image: cimg/openjdk:17.0 +# needs: +# - assemble +# - integrationTests +# - unitTests +# - acceptanceTests +# - referenceTests +# - buildDocker +# steps: +# - uses: actions/checkout@v4.1.0 +# - uses: "./.github/actions/prepare" +# - uses: actions/download-artifact@v3.0.2 +# with: +# path: "~/project" +## # 'setup_remote_docker' was not transformed because there is no suitable equivalent in GitHub Actions +# - name: Publish Docker +# run: |- +# docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}" +# ./gradlew --no-daemon "-Pbranch=${{ github.ref }}" dockerUpload +# publishArm64Docker: +# if: # GitHub does not currently support regular expressions inside if conditions +## github.ref == 'refs/heads/main' || github.ref == 'refs/heads//^release-.*/' +# runs-on: ubuntu-latest +# needs: +# - integrationTests +# - unitTests +# - acceptanceTests +# - referenceTests +# - buildArm64Docker +# steps: +# - uses: actions/checkout@v4.1.0 +# - uses: "./.github/actions/prepare" +# - uses: actions/download-artifact@v3.0.2 +# with: +# path: "~/project" +# - name: Java_17 +# run: |- +# sudo apt install -q --assume-yes openjdk-17-jre-headless openjdk-17-jdk-headless +# sudo update-java-alternatives -a +# - name: Publish Docker +# run: |- +# docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}" +# ./gradlew --no-daemon "-Pbranch=${{ github.ref }}" dockerUpload +# manifestDocker: +# if: # GitHub does not currently support regular expressions inside if conditions +## github.ref == 'refs/heads/main' || github.ref == 'refs/heads//^release-.*/' +# runs-on: ubuntu-latest +# container: +# image: cimg/openjdk:17.0 +# needs: +# - publishDocker +# - publishArm64Docker +# steps: +# - uses: actions/checkout@v4.1.0 +# - uses: "./.github/actions/prepare" +## # 'setup_remote_docker' was not transformed because there is no suitable equivalent in GitHub Actions +# - name: Create and publish docker manifest +# run: |- +# docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}" +# ./gradlew --no-daemon "-Pbranch=${{ github.ref }}" --parallel manifestDocker diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 2be77e8c2ea..24a1c4ff4e8 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -5,7 +5,7 @@ on: [push, pull_request] jobs: validation: name: "Gradle Wrapper Validation" - runs-on: [besu-research-ubuntu-8] + runs-on: ubuntu-latest 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 index 3a4d4342c58..b8ac94efaef 100644 --- a/.github/workflows/pr-checklist-on-open.yml +++ b/.github/workflows/pr-checklist-on-open.yml @@ -2,11 +2,11 @@ name: "comment on pr with checklist" on: pull_request_target: types: [ opened ] - branches: [ main ] + branches: [ release-23.10.x, main ] jobs: checklist: name: "add checklist as a comment on newly opened PRs" - runs-on: [besu-research-ubuntu-8] + runs-on: ubuntu-latest steps: - uses: actions/github-script@v5 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c9b2328208..35b74bbfd04 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: types: released jobs: dockerPromoteX64: - runs-on: [besu-research-ubuntu-16] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 diff --git a/.github/workflows/repolinter.yml b/.github/workflows/repolinter.yml index e1c61cadea8..9440951f032 100644 --- a/.github/workflows/repolinter.yml +++ b/.github/workflows/repolinter.yml @@ -8,14 +8,16 @@ on: branches: - master - main + - release-23.10.x pull_request: branches: - master - main + - release-23.10.x jobs: build: - runs-on: [besu-research-ubuntu-16] + runs-on: ubuntu-latest container: ghcr.io/todogroup/repolinter:v0.10.1 steps: - name: Checkout Code diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index e3a6e088e06..2fee53a12a5 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -14,7 +14,7 @@ permissions: jobs: Analysis: runs-on: ubuntu-latest - if: github.repository == 'hyperledger/besu' + if: github.repository == 'optimism-java/op-besu' steps: - name: checkout uses: actions/checkout@v3 diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/TransactionType.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/TransactionType.java index 984a4cc7467..010b12b1143 100644 --- a/datatypes/src/main/java/org/hyperledger/besu/datatypes/TransactionType.java +++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/TransactionType.java @@ -27,7 +27,10 @@ public enum TransactionType { /** Eip1559 transaction type. */ EIP1559(0x02), /** Blob transaction type. */ - BLOB(0x03); + BLOB(0x03), + + /** Optimism Deposit transaction type. */ + OPTIMISM_DEPOSIT(0x7e); private static final Set ACCESS_LIST_SUPPORTED_TRANSACTION_TYPES = Set.of(ACCESS_LIST, EIP1559, BLOB); 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 b9b657e6689..ac6cc60ef03 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 @@ -39,9 +39,11 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +@Disabled public class EnclaveTest { @TempDir private static Path folder; 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 3b2b8e30958..8594086f9e3 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 @@ -376,6 +376,7 @@ public Transaction transaction( case EIP1559 -> eip1559Transaction(payload, to); case ACCESS_LIST -> accessListTransaction(payload, to); case BLOB -> blobTransaction(payload, to); + case OPTIMISM_DEPOSIT -> throw new UnsupportedOperationException(); // no default, all types accounted for. }; } 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 933e6b3ce0b..09648dee1b9 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 @@ -92,6 +92,8 @@ public Transaction createTransaction(final KeyPair keys) { builder.kzgBlobs(bwc.getKzgCommitments(), bwc.getBlobs(), bwc.getKzgProofs()); }); break; + case OPTIMISM_DEPOSIT: + break; } to.ifPresent(builder::to); 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 index dbc461ecc38..684ebeac616 100644 --- 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 @@ -131,6 +131,7 @@ private int computeMemorySize() { case ACCESS_LIST -> computeAccessListMemorySize(); case EIP1559 -> computeEIP1559MemorySize(); case BLOB -> computeBlobMemorySize(); + case OPTIMISM_DEPOSIT -> throw new UnsupportedOperationException("Not yet implemented"); } + PENDING_TRANSACTION_MEMORY_SIZE; }