fix: fix block value calculation in produceBlockV3 (#6207)

Fix block value calculation
ChainSafe · Dec 22, 2023 · 267991a · 267991a
1 parent ae04197
commit 267991a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/packages/beacon-node/src/api/impl/validator/index.ts b/packages/beacon-node/src/api/impl/validator/index.ts
@@ -35,7 +35,7 @@ import {
   phase0,
 } from "@lodestar/types";
 import {ExecutionStatus} from "@lodestar/fork-choice";
-import {toHex, racePromisesWithCutoff, RaceEvent} from "@lodestar/utils";
+import {toHex, racePromisesWithCutoff, RaceEvent, gweiToWei} from "@lodestar/utils";
 import {AttestationError, AttestationErrorCode, GossipAction, SyncCommitteeError} from "../../../chain/errors/index.js";
 import {validateApiAggregateAndProof} from "../../../chain/validation/index.js";
 import {ZERO_HASH} from "../../../constants/index.js";
@@ -541,8 +541,8 @@ export function getValidatorApi({
     const consensusBlockValueBuilder = blindedBlock?.consensusBlockValue ?? BigInt(0);
     const consensusBlockValueEngine = fullBlock?.consensusBlockValue ?? BigInt(0);
 
-    const blockValueBuilder = builderPayloadValue + consensusBlockValueBuilder;
-    const blockValueEngine = enginePayloadValue + consensusBlockValueEngine;
+    const blockValueBuilder = builderPayloadValue + gweiToWei(consensusBlockValueBuilder); // Total block value is in wei
+    const blockValueEngine = enginePayloadValue + gweiToWei(consensusBlockValueEngine); // Total block value is in wei
 
     let selectedSource: ProducedBlockSource | null = null;
 

diff --git a/packages/utils/src/ethConversion.ts b/packages/utils/src/ethConversion.ts
@@ -0,0 +1,12 @@
+export const ETH_TO_GWEI = BigInt(10 ** 9);
+export const GWEI_TO_WEI = BigInt(10 ** 9);
+export const ETH_TO_WEI = ETH_TO_GWEI * GWEI_TO_WEI;
+
+type EthNumeric = bigint;
+
+/**
+ * Convert gwei to wei.
+ */
+export function gweiToWei(gwei: EthNumeric): EthNumeric {
+  return gwei * GWEI_TO_WEI;
+}
diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -19,3 +19,4 @@ export * from "./url.js";
 export * from "./verifyMerkleBranch.js";
 export * from "./promise.js";
 export * from "./waitFor.js";
+export * from "./ethConversion.js";
diff --git a/packages/validator/src/services/block.ts b/packages/validator/src/services/block.ts
@@ -12,7 +12,7 @@ import {
 } from "@lodestar/types";
 import {ChainForkConfig} from "@lodestar/config";
 import {ForkPreBlobs, ForkBlobs, ForkSeq} from "@lodestar/params";
-import {extendError, prettyBytes} from "@lodestar/utils";
+import {ETH_TO_GWEI, ETH_TO_WEI, extendError, gweiToWei, prettyBytes} from "@lodestar/utils";
 import {Api, ApiError, routes} from "@lodestar/api";
 import {IClock, LoggerVc} from "../util/index.js";
 import {PubkeyHex} from "../types.js";
@@ -21,7 +21,6 @@ import {formatBigDecimal} from "../util/format.js";
 import {ValidatorStore} from "./validatorStore.js";
 import {BlockDutiesService, GENESIS_SLOT} from "./blockDuties.js";
 
-const ETH_TO_WEI = BigInt("1000000000000000000");
 // display upto 5 decimal places
 const MAX_DECIMAL_FACTOR = BigInt("100000");
 
@@ -220,9 +219,9 @@ export class BlockProposingService {
       source: response.executionPayloadBlinded ? ProducedBlockSource.builder : ProducedBlockSource.engine,
       // winston logger doesn't like bigint
       executionPayloadValue: `${formatBigDecimal(response.executionPayloadValue, ETH_TO_WEI, MAX_DECIMAL_FACTOR)} ETH`,
-      consensusBlockValue: `${formatBigDecimal(response.consensusBlockValue, ETH_TO_WEI, MAX_DECIMAL_FACTOR)} ETH`,
+      consensusBlockValue: `${formatBigDecimal(response.consensusBlockValue, ETH_TO_GWEI, MAX_DECIMAL_FACTOR)} ETH`,
       totalBlockValue: `${formatBigDecimal(
-        response.executionPayloadValue + response.consensusBlockValue,
+        response.executionPayloadValue + gweiToWei(response.consensusBlockValue),
         ETH_TO_WEI,
         MAX_DECIMAL_FACTOR
       )} ETH`,