Merge remote-tracking branch 'upstream/master' into secp_bulk

Consensys · Sep 4, 2023 · ce83b20 · ce83b20
2 parents 2ad3250 + 0bb49c6
commit ce83b20
Show file tree

Hide file tree

Showing 22 changed files with 681 additions and 449 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,13 @@
 - Eth2 Signing request body: deprecating `signingRoot` in favor of `signing_root` property. `signingRoot` will be removed in a future release.
 
 ### Features Added
+- Signing support for BlobSidecar and BlindedBlobSidecar in Deneb fork.
 - Add `--azure-response-timeout` to allow request response timeout to be configurable, the field `timeout` is also accepted in the Azure metadata file. [#888](https://github.com/Consensys/web3signer/pull/888)
 - Bulk load Ethereum v3 wallet files in eth1 mode. 
 
+### Bugs fixed
+- Upcheck was using application/json accept headers instead text/plain accept headers
+
 ## 23.8.1
 
 ### Bugs fixed

diff --git a/...ce-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/Eth2BlockSigningRequestUtil.java b/...ce-tests/src/test/java/tech/pegasys/web3signer/dsl/utils/Eth2BlockSigningRequestUtil.java
@@ -84,22 +84,12 @@ public Eth2SigningRequestBody createBlockV2Request() {
   }
 
   public Eth2SigningRequestBody createBlockV2Request(final BlockRequest blockRequest) {
-    return new Eth2SigningRequestBody(
-        ArtifactType.BLOCK_V2,
-        signingRoot,
-        forkInfo,
-        null,
-        blockRequest,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null);
+    return Eth2SigningRequestBodyBuilder.anEth2SigningRequestBody()
+        .withType(ArtifactType.BLOCK_V2)
+        .withSigningRoot(signingRoot)
+        .withForkInfo(forkInfo)
+        .withBlockRequest(blockRequest)
+        .build();
   }
 
   public Eth2SigningRequestBody createLegacyBlockRequest() {
@@ -108,22 +98,12 @@ public Eth2SigningRequestBody createLegacyBlockRequest() {
           "Only PHASE0 spec is supported to create legacy BLOCK type signing request");
     }
 
-    return new Eth2SigningRequestBody(
-        ArtifactType.BLOCK,
-        signingRoot,
-        forkInfo,
-        getBeaconBlock(),
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null);
+    return Eth2SigningRequestBodyBuilder.anEth2SigningRequestBody()
+        .withType(ArtifactType.BLOCK)
+        .withSigningRoot(signingRoot)
+        .withForkInfo(forkInfo)
+        .withBlock(getBeaconBlock())
+        .build();
   }
 
   private BeaconBlockHeader getBeaconBlockHeader() {