From bf5d92b1327264638c49bbe3d9a5048ad4cfc634 Mon Sep 17 00:00:00 2001
From: g11tech <develop@g11tech.io>
Date: Sat, 4 Nov 2023 14:57:17 +0530
Subject: [PATCH] refactor: shift usage to publishblock v2 endpoint, cleanup v1
 post deneb (#6084)

refactor: cleanup publishblock v1 support and usage
---
 packages/api/src/beacon/routes/beacon/block.ts      | 4 ++--
 packages/cli/test/sim/multi_fork.test.ts            | 2 +-
 packages/validator/src/services/block.ts            | 4 ++--
 packages/validator/test/unit/services/block.test.ts | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/api/src/beacon/routes/beacon/block.ts b/packages/api/src/beacon/routes/beacon/block.ts
index 278637d53a2c..2d887790dd39 100644
--- a/packages/api/src/beacon/routes/beacon/block.ts
+++ b/packages/api/src/beacon/routes/beacon/block.ts
@@ -193,7 +193,7 @@ export type Api = {
 
   publishBlockV2(
     blockOrContents: allForks.SignedBeaconBlockOrContents,
-    opts: {broadcastValidation?: BroadcastValidation}
+    opts?: {broadcastValidation?: BroadcastValidation}
   ): Promise<
     ApiClientResponse<
       {
@@ -341,7 +341,7 @@ export function getReqSerializers(config: ChainForkConfig): ReqSerializers<Api,
     getBlockRoot: blockIdOnlyReq,
     publishBlock: reqOnlyBody(AllForksSignedBlockOrContents, Schema.Object),
     publishBlockV2: {
-      writeReq: (item, {broadcastValidation}) => ({
+      writeReq: (item, {broadcastValidation} = {}) => ({
         body: AllForksSignedBlockOrContents.toJson(item),
         query: {broadcast_validation: broadcastValidation},
       }),
diff --git a/packages/cli/test/sim/multi_fork.test.ts b/packages/cli/test/sim/multi_fork.test.ts
index 2cc07445ce95..0ac8d18ed055 100644
--- a/packages/cli/test/sim/multi_fork.test.ts
+++ b/packages/cli/test/sim/multi_fork.test.ts
@@ -218,7 +218,7 @@ await connectNewNode(unknownBlockSync, env.nodes);
 await sleep(5000);
 
 try {
-  ApiError.assert(await unknownBlockSync.beacon.api.beacon.publishBlock(headForUnknownBlockSync.response.data));
+  ApiError.assert(await unknownBlockSync.beacon.api.beacon.publishBlockV2(headForUnknownBlockSync.response.data));
 
   env.tracker.record({
     message: "Publishing unknown block should fail",
diff --git a/packages/validator/src/services/block.ts b/packages/validator/src/services/block.ts
index bbe96ac772a8..c9eeadb06630 100644
--- a/packages/validator/src/services/block.ts
+++ b/packages/validator/src/services/block.ts
@@ -178,7 +178,7 @@ export class BlockProposingService {
       ApiError.assert(
         isBlindedBeaconBlock(signedBlock.message)
           ? await this.api.beacon.publishBlindedBlock(signedBlock as allForks.SignedBlindedBeaconBlock)
-          : await this.api.beacon.publishBlock(signedBlock as allForks.SignedBeaconBlock)
+          : await this.api.beacon.publishBlockV2(signedBlock as allForks.SignedBeaconBlock)
       );
     } else {
       ApiError.assert(
@@ -187,7 +187,7 @@ export class BlockProposingService {
               signedBlindedBlock: signedBlock,
               signedBlindedBlobSidecars: signedBlobSidecars,
             } as allForks.SignedBlindedBlockContents)
-          : await this.api.beacon.publishBlock({signedBlock, signedBlobSidecars} as allForks.SignedBlockContents)
+          : await this.api.beacon.publishBlockV2({signedBlock, signedBlobSidecars} as allForks.SignedBlockContents)
       );
     }
   };
diff --git a/packages/validator/test/unit/services/block.test.ts b/packages/validator/test/unit/services/block.test.ts
index ce7fb3465220..0a533b140a9c 100644
--- a/packages/validator/test/unit/services/block.test.ts
+++ b/packages/validator/test/unit/services/block.test.ts
@@ -67,7 +67,7 @@ describe("BlockDutiesService", function () {
       ok: true,
       status: HttpStatusCode.OK,
     });
-    api.beacon.publishBlock.resolves();
+    api.beacon.publishBlockV2.resolves();
 
     // Trigger block production for slot 1
     const notifyBlockProductionFn = blockService["dutiesService"]["notifyBlockProductionFn"];
@@ -77,7 +77,7 @@ describe("BlockDutiesService", function () {
     await sleep(20, controller.signal);
 
     // Must have submitted the block received on signBlock()
-    expect(api.beacon.publishBlock.callCount).to.equal(1, "publishBlock() must be called once");
-    expect(api.beacon.publishBlock.getCall(0).args).to.deep.equal([signedBlock], "wrong publishBlock() args");
+    expect(api.beacon.publishBlockV2.callCount).to.equal(1, "publishBlock() must be called once");
+    expect(api.beacon.publishBlockV2.getCall(0).args).to.deep.equal([signedBlock], "wrong publishBlock() args");
   });
 });