@lodestar/validator 1.16.0-dev.cd7421e46b → 1.16.0-dev.d01c5425cd
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/services/block.js +4 -7
- package/lib/services/block.js.map +1 -1
- package/package.json +10 -10
package/lib/services/block.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { toHexString } from "@chainsafe/ssz";
|
|
2
2
|
import { isBlindedSignedBeaconBlock, ProducedBlockSource, isBlockContents, } from "@lodestar/types";
|
|
3
3
|
import { ForkSeq } from "@lodestar/params";
|
|
4
|
-
import {
|
|
4
|
+
import { extendError, prettyBytes, prettyWeiToEth } from "@lodestar/utils";
|
|
5
5
|
import { ApiError, routes } from "@lodestar/api";
|
|
6
6
|
import { BlockDutiesService, GENESIS_SLOT } from "./blockDuties.js";
|
|
7
|
-
// display upto 5 decimal places
|
|
8
|
-
const MAX_DECIMAL_FACTOR = BigInt("100000");
|
|
9
7
|
/**
|
|
10
8
|
* Service that sets up and handles validator block proposal duties.
|
|
11
9
|
*/
|
|
@@ -63,10 +61,9 @@ export class BlockProposingService {
|
|
|
63
61
|
const debugLogCtx = {
|
|
64
62
|
executionPayloadSource: response.executionPayloadSource,
|
|
65
63
|
executionPayloadBlinded: response.executionPayloadBlinded,
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
totalBlockValue: `${formatBigDecimal(response.executionPayloadValue + response.consensusBlockValue, ETH_TO_WEI, MAX_DECIMAL_FACTOR)} ETH`,
|
|
64
|
+
executionPayloadValue: prettyWeiToEth(response.executionPayloadValue),
|
|
65
|
+
consensusBlockValue: prettyWeiToEth(response.consensusBlockValue),
|
|
66
|
+
totalBlockValue: prettyWeiToEth(response.executionPayloadValue + response.consensusBlockValue),
|
|
70
67
|
// TODO PR: should be used in api call instead of adding in log
|
|
71
68
|
strictFeeRecipientCheck,
|
|
72
69
|
builderSelection,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../src/services/block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAKL,0BAA0B,EAC1B,mBAAmB,EAEnB,eAAe,GAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAA0B,OAAO,EAAgB,MAAM,kBAAkB,CAAC;AACjF,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../src/services/block.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lodestar/validator",
|
|
3
|
-
"version": "1.16.0-dev.
|
|
3
|
+
"version": "1.16.0-dev.d01c5425cd",
|
|
4
4
|
"description": "A Typescript implementation of the validator client",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "LGPL-3.0",
|
|
@@ -47,20 +47,20 @@
|
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@chainsafe/bls": "7.1.3",
|
|
49
49
|
"@chainsafe/ssz": "^0.14.0",
|
|
50
|
-
"@lodestar/api": "1.16.0-dev.
|
|
51
|
-
"@lodestar/config": "1.16.0-dev.
|
|
52
|
-
"@lodestar/db": "1.16.0-dev.
|
|
53
|
-
"@lodestar/params": "1.16.0-dev.
|
|
54
|
-
"@lodestar/state-transition": "1.16.0-dev.
|
|
55
|
-
"@lodestar/types": "1.16.0-dev.
|
|
56
|
-
"@lodestar/utils": "1.16.0-dev.
|
|
50
|
+
"@lodestar/api": "1.16.0-dev.d01c5425cd",
|
|
51
|
+
"@lodestar/config": "1.16.0-dev.d01c5425cd",
|
|
52
|
+
"@lodestar/db": "1.16.0-dev.d01c5425cd",
|
|
53
|
+
"@lodestar/params": "1.16.0-dev.d01c5425cd",
|
|
54
|
+
"@lodestar/state-transition": "1.16.0-dev.d01c5425cd",
|
|
55
|
+
"@lodestar/types": "1.16.0-dev.d01c5425cd",
|
|
56
|
+
"@lodestar/utils": "1.16.0-dev.d01c5425cd",
|
|
57
57
|
"bigint-buffer": "^1.1.5",
|
|
58
58
|
"strict-event-emitter-types": "^2.0.0"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@lodestar/test-utils": "1.16.0-dev.
|
|
61
|
+
"@lodestar/test-utils": "1.16.0-dev.d01c5425cd",
|
|
62
62
|
"bigint-buffer": "^1.1.5",
|
|
63
63
|
"rimraf": "^4.4.1"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "1e6ee23e6dd73b705483309165efa21b1ff42bb8"
|
|
66
66
|
}
|