Revert "Add EIP 7778 to Amsterdam (besu-eth#9664)"

This reverts commit efb004f

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>

Author: Matilda-Clerke

CHANGELOG.md

@@ -82,9 +82,11 @@
 - Update to log4j 2.25.3 [#9600](https://github.com/hyperledger/besu/pull/9600)
 - Add `engine_getBlobsV3` method [#9582](https://github.com/hyperledger/besu/pull/9582)
 - Verify plugins on start [#9601](https://github.com/hyperledger/besu/pull/9601)
+- Improved `getBlobsV2` performance by disabling HTTP response compression, with up to 10× throughput improvement observed for large numbers of blobs. [#9667](https://github.com/hyperledger/besu/pull/9667)
 - Add EIP-7778 to Amsterdam [#9664](https://github.com/hyperledger/besu/pull/9664)
 - Treat EndOfRLPException as invalid packet in peer discovery, meaning you will no longer see these exceptions, unless you enable DEBUG logs [#9597](https://github.com/hyperledger/besu/pull/9597)
 
+
 ### Bug fixes
 - Fix promotion to prioritized layer for gas price fee markets [#9635](https://github.com/hyperledger/besu/pull/9635)
 - Fix callTracer to properly capture nested calls and populate revertReason field when transactions revert [#9651](https://github.com/hyperledger/besu/pull/9651)

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithGasSpent.java

@@ -73,27 +73,6 @@ public EthGetTransactionReceiptWithRevertReason getTransactionReceiptWithRevertR
     return new EthGetTransactionReceiptWithRevertReason(transactionHash);
   }
 
-  /**
-   * Fetches a transaction receipt with gasSpent field (EIP-7778, Amsterdam+).
-   *
-   * @param transactionHash the hash of the transaction
-   * @return the transaction to fetch the receipt with gasSpent
-   */
-  public EthGetTransactionReceiptWithGasSpent getTransactionReceiptWithGasSpent(
-      final String transactionHash) {
-    return new EthGetTransactionReceiptWithGasSpent(transactionHash);
-  }
-
-  /**
-   * Fetches a block with slotNumber field (EIP-7843, Amsterdam+).
-   *
-   * @param blockNumber the block number as hex string (e.g., "0x1") or "latest"
-   * @return the transaction to fetch the block with slotNumber
-   */
-  public EthGetBlockWithSlotNumber getBlockWithSlotNumber(final String blockNumber) {
-    return new EthGetBlockWithSlotNumber(blockNumber);
-  }
-
   public EthMiningTransaction mining() {
     return new EthMiningTransaction();
   }
@@ -109,12 +88,4 @@ public EthNewPendingTransactionFilterTransaction newPendingTransactionsFilter()
   public EthFilterChangesTransaction filterChanges(final BigInteger filterId) {
     return new EthFilterChangesTransaction(filterId);
   }
-
-  public EthCallTransaction call(final String contractAddress, final String functionCall) {
-    return new EthCallTransaction(contractAddress, functionCall);
-  }
-
-  public EthCallTransaction call(final String contractAddress) {
-    return new EthCallTransaction(contractAddress, "0x");
-  }
 }

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/transaction/eth/EthTransactions.java

@@ -47,65 +47,6 @@ public String getRevertReason() {
   public static class EthGetTransactionReceiptWithRevertReasonResponse
       extends Response<TransactionReceiptWithRevertReason> {}
 
-  /**
-   * Transaction receipt that includes the gasSpent field introduced by EIP-7778 (Amsterdam+). This
-   * extends the standard web3j TransactionReceipt to include the new field.
-   */
-  public static class TransactionReceiptWithGasSpent extends TransactionReceipt {
-    private String gasSpent;
-
-    public TransactionReceiptWithGasSpent() {}
-
-    public void setGasSpent(final String gasSpent) {
-      this.gasSpent = gasSpent;
-    }
-
-    public String getGasSpent() {
-      return gasSpent;
-    }
-  }
-
-  public static class EthGetTransactionReceiptWithGasSpentResponse
-      extends Response<TransactionReceiptWithGasSpent> {}
-
-  /**
-   * Block result that includes the slotNumber field introduced by EIP-7843 (Amsterdam+). This
-   * provides access to the slot number field that is not available in standard web3j EthBlock.
-   */
-  public static class BlockWithSlotNumber {
-    private String number;
-    private String hash;
-    private String slotNumber;
-
-    public BlockWithSlotNumber() {}
-
-    public String getNumber() {
-      return number;
-    }
-
-    public void setNumber(final String number) {
-      this.number = number;
-    }
-
-    public String getHash() {
-      return hash;
-    }
-
-    public void setHash(final String hash) {
-      this.hash = hash;
-    }
-
-    public String getSlotNumber() {
-      return slotNumber;
-    }
-
-    public void setSlotNumber(final String slotNumber) {
-      this.slotNumber = slotNumber;
-    }
-  }
-
-  public static class EthGetBlockWithSlotNumberResponse extends Response<BlockWithSlotNumber> {}
-
   public CustomRequestFactory(final Web3jService web3jService) {
     this.web3jService = web3jService;
   }
@@ -123,35 +64,4 @@ public Request<?, NetServicesResponse> netServices() {
         web3jService,
         EthGetTransactionReceiptWithRevertReasonResponse.class);
   }
-
-  /**
-   * Fetches a transaction receipt with gasSpent field (EIP-7778, Amsterdam+).
-   *
-   * @param transactionHash the hash of the transaction
-   * @return the request that returns a receipt with gasSpent
-   */
-  public Request<?, EthGetTransactionReceiptWithGasSpentResponse>
-      ethGetTransactionReceiptWithGasSpent(final String transactionHash) {
-    return new Request<>(
-        "eth_getTransactionReceipt",
-        Collections.singletonList(transactionHash),
-        web3jService,
-        EthGetTransactionReceiptWithGasSpentResponse.class);
-  }
-
-  /**
-   * Fetches a block by number with slotNumber field (EIP-7843, Amsterdam+).
-   *
-   * @param blockNumber the block number (hex string like "0x1" or "latest")
-   * @param fullTransactionObjects whether to return full transaction objects
-   * @return the request that returns a block with slotNumber
-   */
-  public Request<?, EthGetBlockWithSlotNumberResponse> ethGetBlockByNumberWithSlotNumber(
-      final String blockNumber, final boolean fullTransactionObjects) {
-    return new Request<>(
-        "eth_getBlockByNumber",
-        Arrays.asList(blockNumber, fullTransactionObjects),
-        web3jService,
-        EthGetBlockWithSlotNumberResponse.class);
-  }
 }