Merge branch 'main' into debug-trace-with-pipeline

acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java

@@ -58,7 +58,6 @@ public static BlockHeader createBlockHeader(
         null,
         null,
         null,
-        null,
         blockHeaderFunctions);
   }
 }

besu/src/test/java/org/hyperledger/besu/controller/AbstractBftBesuControllerBuilderTest.java

@@ -195,7 +195,6 @@ public void miningParametersBlockPeriodSecondsIsUpdatedOnTransition() {
             null,
             null,
             null,
-            null,
             getBlockHeaderFunctions());
     final Block block1 = new Block(header1, BlockBody.empty());
 

besu/src/test/java/org/hyperledger/besu/controller/CliqueBesuControllerBuilderTest.java

@@ -224,7 +224,6 @@ public void miningParametersBlockPeriodSecondsIsUpdatedOnTransition() {
             null,
             null,
             null,
-            null,
             new CliqueBlockHeaderFunctions());
     final Block block1 = new Block(header1, BlockBody.empty());
 

besu/src/test/java/org/hyperledger/besu/services/BesuEventsImplTest.java

@@ -219,7 +219,7 @@ private void 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, null, null, null));
   }
 
   private void clearSyncTarget() {

config/src/main/java/org/hyperledger/besu/config/GenesisConfig.java

@@ -265,17 +265,6 @@ public String getParentBeaconBlockRoot() {
         "0x0000000000000000000000000000000000000000000000000000000000000000");
   }
 
-  /**
-   * Gets target blobs per block.
-   *
-   * @return the target blobs per block
-   */
-  public Optional<String> getTargetBlobsPerBlock() {
-    // TODO SLD EIP-7742 not sure if we should use a default value here or enforce any
-    // "pragueAtGenesis" genesis file (used in devnets) to have this value
-    return JsonUtil.getValueAsString(genesisRoot, "targetblobsperblock");
-  }
-
   /**
    * Gets coinbase.
    *

crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/AbstractSECP256.java

@@ -233,6 +233,11 @@ public String getProvider() {
     return PROVIDER;
   }
 
+  @Override
+  public ECDomainParameters getCurve() {
+    return curve;
+  }
+
   /**
    * Gets K calculator.
    *

crypto/algorithms/src/main/java/org/hyperledger/besu/crypto/SignatureAlgorithm.java

@@ -20,6 +20,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.math.ec.ECPoint;
 
 /** The interface Signature algorithm. */
@@ -124,6 +125,13 @@ SECPSignature normaliseSignature(
    */
   String getCurveName();
 
+  /**
+   * Bouncy castle ECDomainParameters representing the curve.
+   *
+   * @return instance of ECDomainParameters
+   */
+  ECDomainParameters getCurve();
+
   /**
    * Create secp private key.
    *

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseKey.java

@@ -38,6 +38,5 @@ public enum JsonRpcResponseKey {
   TRANSACTION_ROOT,
   BASEFEE,
   WITHDRAWALS_ROOT,
-  REQUESTS_HASH,
-  TARGET_BLOBS_PER_BLOCK
+  REQUESTS_HASH
 }

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java

@@ -63,7 +63,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.units.bigints.UInt256;
-import org.apache.tuweni.units.bigints.UInt64;
 
 public class JsonRpcResponseUtils {
 
@@ -107,10 +106,6 @@ public JsonRpcResponse response(
         values.containsKey(WITHDRAWALS_ROOT) ? hash(values.get(WITHDRAWALS_ROOT)) : null;
     final Hash requestsHash =
         values.containsKey(REQUESTS_HASH) ? hash(values.get(REQUESTS_HASH)) : null;
-    final UInt64 targetBlobsPerBlock =
-        values.containsKey(JsonRpcResponseKey.TARGET_BLOBS_PER_BLOCK)
-            ? UInt64.fromHexString(values.get(JsonRpcResponseKey.TARGET_BLOBS_PER_BLOCK))
-            : null;
     final List<JsonNode> ommers = new ArrayList<>();
 
     final BlockHeader header =
@@ -136,7 +131,6 @@ public JsonRpcResponse response(
             null, // ToDo 4844: set with the value of excess_blob_gas field
             null, // TODO 4788: set with the value of the parent beacon block root field
             requestsHash,
-            targetBlobsPerBlock,
             blockHeaderFunctions);
 
     return new JsonRpcSuccessResponse(

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java

@@ -266,7 +266,6 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
                 : BlobGas.fromHexString(blockParam.getExcessBlobGas()),
             maybeParentBeaconBlockRoot.orElse(null),
             maybeRequests.map(BodyValidation::requestsHash).orElse(null),
-            null, // TODO SLD EIP-7742 wiring in future PR
             headerFunctions);
 
     // ensure the block hash matches the blockParam hash

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResult.java

@@ -88,7 +88,6 @@ public class BlockResult implements JsonRpcResult {
   private final String blobGasUsed;
   private final String excessBlobGas;
   private final String parentBeaconBlockRoot;
-  private final String targetBlobsPerBlock;
   private final List<CallProcessingResult> callProcessingResults;
 
   public BlockResult(
@@ -153,7 +152,6 @@ public BlockResult(
     this.excessBlobGas = header.getExcessBlobGas().map(Quantity::create).orElse(null);
     this.parentBeaconBlockRoot =
         header.getParentBeaconBlockRoot().map(Bytes32::toHexString).orElse(null);
-    this.targetBlobsPerBlock = header.getTargetBlobsPerBlock().map(Quantity::create).orElse(null);
   }
 
   @JsonGetter(value = "number")
@@ -292,11 +290,6 @@ public String getParentBeaconBlockRoot() {
     return parentBeaconBlockRoot;
   }
 
-  @JsonGetter(value = "targetBlobsPerBlock")
-  public String getTargetBlobsPerBlock() {
-    return targetBlobsPerBlock;
-  }
-
   @JsonGetter(value = "calls")
   public List<CallProcessingResult> getTransactionProcessingResults() {
     return callProcessingResults;

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGasPriceTest.java

@@ -372,7 +372,6 @@ private Block createFakeBlock(
             null,
             null,
             null,
-            null,
             null),
         new BlockBody(
             IntStream.range(0, txsNum)

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthMaxPriorityFeePerGasTest.java

@@ -207,7 +207,6 @@ private Block createFakeBlock(
             null,
             null,
             null,
-            null,
             null),
         new BlockBody(
             IntStream.range(0, txsNum)

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java

@@ -254,7 +254,6 @@ private BlockHeader createBlockHeader(final Hash blockHash, final long blockNumb
         null,
         null,
         null,
-        null,
         new BlockHeaderFunctions() {
           @Override
           public Hash hash(final BlockHeader header) {

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueriesLogCacheTest.java

@@ -120,7 +120,6 @@ public void setup() {
             null,
             null,
             null,
-            null,
             new MainnetBlockHeaderFunctions());
     testHash = fakeHeader.getHash();
     final BlockBody fakeBody = new BlockBody(Collections.emptyList(), Collections.emptyList());

ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/query/cache/TransactionLogBloomCacherTest.java

@@ -108,7 +108,6 @@ public void setup() throws IOException {
             null,
             null,
             null,
-            null,
             new MainnetBlockHeaderFunctions());
     testHash = fakeHeader.getHash();
     when(blockchain.getBlockHeader(anyLong())).thenReturn(Optional.of(fakeHeader));
@@ -284,7 +283,6 @@ private BlockHeader createBlock(final long number, final Optional<String> messag
             null,
             null,
             null,
-            null,
             new MainnetBlockHeaderFunctions());
     testHash = fakeHeader.getHash();
     when(blockchain.getBlockHeader(number)).thenReturn(Optional.of(fakeHeader));

ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/debug/trace-call/debug_traceCall_noGasPrice.json

@@ -4,7 +4,7 @@
     "method": "debug_traceCall",
     "params": [
       {
-        "to": "0x0aae40965e6800cd9b1f4b05ff21581047e3f91e",
+        "to": "0x0F792be4B0c0cb4DAE440Ef133E90C0eCD48CCCC",
         "data": "0x000000000000000000000000000000000000000000000000000000000001A00E"
       },
       "latest",

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java

@@ -48,7 +48,6 @@
 import com.google.common.base.MoreObjects;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt64;
 
 public final class GenesisState {
 
@@ -217,12 +216,6 @@ private static BlockHeader buildHeader(
         .parentBeaconBlockRoot(
             (isCancunAtGenesis(genesis) ? parseParentBeaconBlockRoot(genesis) : null))
         .requestsHash(isPragueAtGenesis(genesis) ? Hash.EMPTY_REQUESTS_HASH : null)
-        .targetBlobsPerBlock(
-            isPragueAtGenesis(genesis)
-                // TODO SLD EIP-7742 Currently defaulting to null due to dependency on web3j
-                // BlockHeader in CodeDelegationTransactionAcceptanceTest
-                ? genesis.getTargetBlobsPerBlock().map(UInt64::fromHexString).orElse(null)
-                : null)
         .buildBlockHeader();
   }
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java

@@ -28,7 +28,6 @@
 import com.google.common.base.Suppliers;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt64;
 
 /** A mined Ethereum block header. */
 public class BlockHeader extends SealableBlockHeader
@@ -66,7 +65,6 @@ public BlockHeader(
       final BlobGas excessBlobGas,
       final Bytes32 parentBeaconBlockRoot,
       final Hash requestsHash,
-      final UInt64 targetBlobsPerBlock,
       final BlockHeaderFunctions blockHeaderFunctions) {
     super(
         parentHash,
@@ -88,8 +86,7 @@ public BlockHeader(
         blobGasUsed,
         excessBlobGas,
         parentBeaconBlockRoot,
-        requestsHash,
-        targetBlobsPerBlock);
+        requestsHash);
     this.nonce = nonce;
     this.hash = Suppliers.memoize(() -> blockHeaderFunctions.hash(this));
     this.parsedExtraData = Suppliers.memoize(() -> blockHeaderFunctions.parseExtraData(this));
@@ -190,9 +187,6 @@ public void writeTo(final RLPOutput out) {
 
       if (requestsHash == null) break;
       out.writeBytes(requestsHash);
-
-      if (targetBlobsPerBlock == null) break;
-      out.writeUInt64Scalar(targetBlobsPerBlock);
     } while (false);
     out.endList();
   }
@@ -225,8 +219,6 @@ public static BlockHeader readFrom(
         !input.isEndOfCurrentList() ? BlobGas.of(input.readUInt64Scalar()) : null;
     final Bytes32 parentBeaconBlockRoot = !input.isEndOfCurrentList() ? input.readBytes32() : null;
     final Hash requestsHash = !input.isEndOfCurrentList() ? Hash.wrap(input.readBytes32()) : null;
-    final UInt64 targetBlobsPerBlock =
-        !input.isEndOfCurrentList() ? input.readUInt64Scalar() : null;
     input.leaveList();
     return new BlockHeader(
         parentHash,
@@ -250,7 +242,6 @@ public static BlockHeader readFrom(
         excessBlobGas,
         parentBeaconBlockRoot,
         requestsHash,
-        targetBlobsPerBlock,
         blockHeaderFunctions);
   }
 
@@ -304,9 +295,6 @@ public String toString() {
     if (requestsHash != null) {
       sb.append("requestsHash=").append(requestsHash);
     }
-    if (targetBlobsPerBlock != null) {
-      sb.append("targetBlobsPerBlock=").append(targetBlobsPerBlock);
-    }
     return sb.append("}").toString();
   }
 
@@ -341,7 +329,6 @@ public static org.hyperledger.besu.ethereum.core.BlockHeader convertPluginBlockH
             .getRequestsHash()
             .map(h -> Hash.fromHexString(h.toHexString()))
             .orElse(null),
-        pluginBlockHeader.getTargetBlobsPerBlock().orElse(null),
         blockHeaderFunctions);
   }
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java

@@ -34,7 +34,6 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import org.apache.tuweni.units.bigints.UInt64;
 
 /** A utility class for building block headers. */
 public class BlockHeaderBuilder {
@@ -81,7 +80,6 @@ public class BlockHeaderBuilder {
   private Long blobGasUsed = null;
   private BlobGas excessBlobGas = null;
   private Bytes32 parentBeaconBlockRoot = null;
-  private UInt64 targetBlobsPerBlock = null;
 
   public static BlockHeaderBuilder create() {
     return new BlockHeaderBuilder();
@@ -130,8 +128,7 @@ public static BlockHeaderBuilder fromHeader(final BlockHeader header) {
         .blobGasUsed(header.getBlobGasUsed().orElse(null))
         .excessBlobGas(header.getExcessBlobGas().orElse(null))
         .parentBeaconBlockRoot(header.getParentBeaconBlockRoot().orElse(null))
-        .requestsHash(header.getRequestsHash().orElse(null))
-        .targetBlobsPerBlock(header.getTargetBlobsPerBlock().orElse(null));
+        .requestsHash(header.getRequestsHash().orElse(null));
   }
 
   public static BlockHeaderBuilder fromBuilder(final BlockHeaderBuilder fromBuilder) {
@@ -156,7 +153,6 @@ public static BlockHeaderBuilder fromBuilder(final BlockHeaderBuilder fromBuilde
             .excessBlobGas(fromBuilder.excessBlobGas)
             .parentBeaconBlockRoot(fromBuilder.parentBeaconBlockRoot)
             .requestsHash(fromBuilder.requestsHash)
-            .targetBlobsPerBlock(fromBuilder.targetBlobsPerBlock)
             .blockHeaderFunctions(fromBuilder.blockHeaderFunctions);
     toBuilder.nonce = fromBuilder.nonce;
     return toBuilder;
@@ -236,7 +232,6 @@ public BlockHeader buildBlockHeader() {
         excessBlobGas,
         parentBeaconBlockRoot,
         requestsHash,
-        targetBlobsPerBlock,
         blockHeaderFunctions);
   }
 
@@ -252,8 +247,7 @@ public ProcessableBlockHeader buildProcessableBlockHeader() {
         timestamp,
         baseFee,
         mixHashOrPrevRandao,
-        parentBeaconBlockRoot,
-        targetBlobsPerBlock);
+        parentBeaconBlockRoot);
   }
 
   public SealableBlockHeader buildSealableBlockHeader() {
@@ -279,8 +273,7 @@ public SealableBlockHeader buildSealableBlockHeader() {
         blobGasUsed,
         excessBlobGas,
         parentBeaconBlockRoot,
-        requestsHash,
-        targetBlobsPerBlock);
+        requestsHash);
   }
 
   private void validateBlockHeader() {
@@ -320,7 +313,6 @@ public BlockHeaderBuilder populateFrom(final ProcessableBlockHeader processableB
     baseFee(processableBlockHeader.getBaseFee().orElse(null));
     processableBlockHeader.getPrevRandao().ifPresent(this::prevRandao);
     processableBlockHeader.getParentBeaconBlockRoot().ifPresent(this::parentBeaconBlockRoot);
-    processableBlockHeader.getTargetBlobsPerBlock().ifPresent(this::targetBlobsPerBlock);
     return this;
   }
 
@@ -346,7 +338,6 @@ public BlockHeaderBuilder populateFrom(final SealableBlockHeader sealableBlockHe
     sealableBlockHeader.getExcessBlobGas().ifPresent(this::excessBlobGas);
     sealableBlockHeader.getParentBeaconBlockRoot().ifPresent(this::parentBeaconBlockRoot);
     requestsHash(sealableBlockHeader.getRequestsHash().orElse(null));
-    sealableBlockHeader.getTargetBlobsPerBlock().ifPresent(this::targetBlobsPerBlock);
     return this;
   }
 
@@ -480,9 +471,4 @@ public BlockHeaderBuilder parentBeaconBlockRoot(final Bytes32 parentBeaconBlockR
     this.parentBeaconBlockRoot = parentBeaconBlockRoot;
     return this;
   }
-
-  public BlockHeaderBuilder targetBlobsPerBlock(final UInt64 targetBlobsPerBlock) {
-    this.targetBlobsPerBlock = targetBlobsPerBlock;
-    return this;
-  }
 }