@chainsafe/lodestar 1.30.0-dev.9f1d8d65fd → 1.30.0-dev.ca57e6c9b2
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/.git-data.json +1 -1
- package/lib/networks/index.js +6 -15
- package/lib/networks/index.js.map +1 -1
- package/package.json +14 -14
package/.git-data.json
CHANGED
package/lib/networks/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import { ENR } from "@chainsafe/enr";
|
|
3
|
-
import {
|
|
3
|
+
import { WireFormat, getClient } from "@lodestar/api";
|
|
4
4
|
import { getStateSlotFromBytes } from "@lodestar/beacon-node";
|
|
5
5
|
import { SLOTS_PER_EPOCH } from "@lodestar/params";
|
|
6
6
|
import { computeCheckpointEpochAtStateSlot, getLatestBlockRoot, loadState, } from "@lodestar/state-transition";
|
|
7
|
+
import { sszTypesFor } from "@lodestar/types";
|
|
7
8
|
import { callFnWhenAwait, formatBytes, fromHex } from "@lodestar/utils";
|
|
8
9
|
import { fetch } from "@lodestar/utils";
|
|
9
10
|
import { parseBootnodesFile } from "../util/format.js";
|
|
@@ -129,30 +130,20 @@ export async function fetchWeakSubjectivityState(config, logger, { checkpointSyn
|
|
|
129
130
|
wsCheckpoint = null;
|
|
130
131
|
}
|
|
131
132
|
// getStateV2 should be available for all forks including phase0
|
|
132
|
-
const getStatePromise = api.debug.getStateV2({ stateId }, {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
// Set Accept header explicitly to fix Checkpointz incompatibility
|
|
136
|
-
// See https://github.com/ethpandaops/checkpointz/issues/165
|
|
137
|
-
[HttpHeader.Accept]: MediaType.ssz,
|
|
138
|
-
},
|
|
139
|
-
});
|
|
140
|
-
const wsStateBytes = await callFnWhenAwait(getStatePromise, () => logger.info("Download in progress, please wait..."), GET_STATE_LOG_INTERVAL).then((res) => {
|
|
141
|
-
return res.ssz();
|
|
133
|
+
const getStatePromise = api.debug.getStateV2({ stateId }, { responseWireFormat: WireFormat.ssz });
|
|
134
|
+
const { wsStateBytes, fork } = await callFnWhenAwait(getStatePromise, () => logger.info("Download in progress, please wait..."), GET_STATE_LOG_INTERVAL).then((res) => {
|
|
135
|
+
return { wsStateBytes: res.ssz(), fork: res.meta().version };
|
|
142
136
|
});
|
|
143
137
|
const wsSlot = getStateSlotFromBytes(wsStateBytes);
|
|
144
138
|
const logData = { stateId, size: formatBytes(wsStateBytes.length) };
|
|
145
139
|
logger.info("Download completed", typeof stateId === "number" ? logData : { ...logData, slot: wsSlot });
|
|
146
|
-
// It should not be required to get fork type from bytes but Checkpointz does not return
|
|
147
|
-
// Eth-Consensus-Version header, see https://github.com/ethpandaops/checkpointz/issues/164
|
|
148
140
|
let wsState;
|
|
149
141
|
if (lastDbState && lastDbValidatorsBytes) {
|
|
150
142
|
// use lastDbState to load wsState if possible to share the same state tree
|
|
151
143
|
wsState = loadState(config, lastDbState, wsStateBytes, lastDbValidatorsBytes).state;
|
|
152
144
|
}
|
|
153
145
|
else {
|
|
154
|
-
|
|
155
|
-
wsState = stateType.deserializeToViewDU(wsStateBytes);
|
|
146
|
+
wsState = sszTypesFor(fork).BeaconState.deserializeToViewDU(wsStateBytes);
|
|
156
147
|
}
|
|
157
148
|
return {
|
|
158
149
|
wsState,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/networks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAC,GAAG,EAAC,MAAM,gBAAgB,CAAC;AACnC,OAAO,EAAC,UAAU,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/networks/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@chainsafe/lodestar",
|
|
3
|
-
"version": "1.30.0-dev.
|
|
3
|
+
"version": "1.30.0-dev.ca57e6c9b2",
|
|
4
4
|
"description": "Command line interface for lodestar",
|
|
5
5
|
"author": "ChainSafe Systems",
|
|
6
6
|
"license": "LGPL-3.0",
|
|
@@ -62,17 +62,17 @@
|
|
|
62
62
|
"@libp2p/crypto": "^5.0.15",
|
|
63
63
|
"@libp2p/interface": "^2.7.0",
|
|
64
64
|
"@libp2p/peer-id": "^5.1.0",
|
|
65
|
-
"@lodestar/api": "1.30.0-dev.
|
|
66
|
-
"@lodestar/beacon-node": "1.30.0-dev.
|
|
67
|
-
"@lodestar/config": "1.30.0-dev.
|
|
68
|
-
"@lodestar/db": "1.30.0-dev.
|
|
69
|
-
"@lodestar/light-client": "1.30.0-dev.
|
|
70
|
-
"@lodestar/logger": "1.30.0-dev.
|
|
71
|
-
"@lodestar/params": "1.30.0-dev.
|
|
72
|
-
"@lodestar/state-transition": "1.30.0-dev.
|
|
73
|
-
"@lodestar/types": "1.30.0-dev.
|
|
74
|
-
"@lodestar/utils": "1.30.0-dev.
|
|
75
|
-
"@lodestar/validator": "1.30.0-dev.
|
|
65
|
+
"@lodestar/api": "1.30.0-dev.ca57e6c9b2",
|
|
66
|
+
"@lodestar/beacon-node": "1.30.0-dev.ca57e6c9b2",
|
|
67
|
+
"@lodestar/config": "1.30.0-dev.ca57e6c9b2",
|
|
68
|
+
"@lodestar/db": "1.30.0-dev.ca57e6c9b2",
|
|
69
|
+
"@lodestar/light-client": "1.30.0-dev.ca57e6c9b2",
|
|
70
|
+
"@lodestar/logger": "1.30.0-dev.ca57e6c9b2",
|
|
71
|
+
"@lodestar/params": "1.30.0-dev.ca57e6c9b2",
|
|
72
|
+
"@lodestar/state-transition": "1.30.0-dev.ca57e6c9b2",
|
|
73
|
+
"@lodestar/types": "1.30.0-dev.ca57e6c9b2",
|
|
74
|
+
"@lodestar/utils": "1.30.0-dev.ca57e6c9b2",
|
|
75
|
+
"@lodestar/validator": "1.30.0-dev.ca57e6c9b2",
|
|
76
76
|
"@multiformats/multiaddr": "^12.1.3",
|
|
77
77
|
"deepmerge": "^4.3.1",
|
|
78
78
|
"ethers": "^6.7.0",
|
|
@@ -87,12 +87,12 @@
|
|
|
87
87
|
"yargs": "^17.7.1"
|
|
88
88
|
},
|
|
89
89
|
"devDependencies": {
|
|
90
|
-
"@lodestar/test-utils": "1.30.0-dev.
|
|
90
|
+
"@lodestar/test-utils": "1.30.0-dev.ca57e6c9b2",
|
|
91
91
|
"@types/debug": "^4.1.7",
|
|
92
92
|
"@types/inquirer": "^9.0.3",
|
|
93
93
|
"@types/proper-lockfile": "^4.1.4",
|
|
94
94
|
"@types/yargs": "^17.0.24",
|
|
95
95
|
"fastify": "^5.2.1"
|
|
96
96
|
},
|
|
97
|
-
"gitHead": "
|
|
97
|
+
"gitHead": "77de3e67784a21cd7278549150b1c9972fcf952c"
|
|
98
98
|
}
|