@lodestar/api 1.23.0-dev.cd98c23768 → 1.23.0-dev.d44c409eaa
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/beacon/routes/beacon/index.d.ts +1 -1
- package/lib/beacon/routes/beacon/index.js.map +1 -1
- package/lib/beacon/routes/beacon/state.d.ts +34 -5
- package/lib/beacon/routes/beacon/state.js +28 -0
- package/lib/beacon/routes/beacon/state.js.map +1 -1
- package/lib/beacon/routes/debug.d.ts +26 -1
- package/lib/beacon/routes/debug.js +33 -0
- package/lib/beacon/routes/debug.js.map +1 -1
- package/lib/utils/client/response.js +3 -0
- package/lib/utils/client/response.js.map +1 -1
- package/lib/utils/schema.js +11 -1
- package/lib/utils/schema.js.map +1 -1
- package/lib/utils/server/parser.js +1 -11
- package/lib/utils/server/parser.js.map +1 -1
- package/package.json +7 -7
|
@@ -10,7 +10,7 @@ export { block, pool, state, rewards };
|
|
|
10
10
|
export { BroadcastValidation } from "./block.js";
|
|
11
11
|
export type { BlockId, BlockHeaderResponse } from "./block.js";
|
|
12
12
|
export type { BlockRewards, AttestationsRewards, IdealAttestationsReward, TotalAttestationsReward, SyncCommitteeRewards, } from "./rewards.js";
|
|
13
|
-
export type { StateId, ValidatorId, ValidatorStatus, FinalityCheckpoints, ValidatorResponse, ValidatorBalance, EpochCommitteeResponse, EpochSyncCommitteeResponse, } from "./state.js";
|
|
13
|
+
export type { StateId, ValidatorId, ValidatorIdentities, ValidatorStatus, FinalityCheckpoints, ValidatorResponse, ValidatorBalance, EpochCommitteeResponse, EpochSyncCommitteeResponse, } from "./state.js";
|
|
14
14
|
export type Endpoints = block.Endpoints & pool.Endpoints & state.Endpoints & rewards.Endpoints & {
|
|
15
15
|
getGenesis: Endpoint<"GET", EmptyArgs, EmptyRequest, phase0.Genesis, EmptyMeta>;
|
|
16
16
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/beacon/routes/beacon/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAY,iBAAiB,EAAa,cAAc,EAAe,MAAM,0BAA0B,CAAC;AAC/G,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,yFAAyF;AAEzF,uGAAuG;AACvG,iFAAiF;AACjF,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAC,CAAC;AACrC,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/beacon/routes/beacon/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAY,iBAAiB,EAAa,cAAc,EAAe,MAAM,0BAA0B,CAAC;AAC/G,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,yFAAyF;AAEzF,uGAAuG;AACvG,iFAAiF;AACjF,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAC,CAAC;AACrC,OAAO,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAoC/C,MAAM,UAAU,cAAc,CAAC,MAAuB;IACpD,OAAO;QACL,UAAU,EAAE;YACV,GAAG,EAAE,wBAAwB;YAC7B,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,iBAAiB;YACtB,IAAI,EAAE;gBACJ,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO;gBACxB,IAAI,EAAE,cAAc;aACrB;SACF;QACD,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;QAC/B,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;QAC9B,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;QAC/B,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC;KAClC,CAAC;AACJ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ContainerType, ValueOf } from "@chainsafe/ssz";
|
|
2
2
|
import { ChainForkConfig } from "@lodestar/config";
|
|
3
|
-
import { phase0, CommitteeIndex, Slot, Epoch, RootHex, StringType } from "@lodestar/types";
|
|
3
|
+
import { phase0, CommitteeIndex, Slot, Epoch, RootHex, StringType, ValidatorStatus } from "@lodestar/types";
|
|
4
4
|
import { Endpoint, RouteDefinitions } from "../../../utils/index.js";
|
|
5
5
|
import { ExecutionOptimisticAndFinalizedMeta } from "../../../utils/metadata.js";
|
|
6
6
|
import { RootResponse } from "./block.js";
|
|
@@ -13,22 +13,22 @@ export type StateArgs = {
|
|
|
13
13
|
stateId: StateId;
|
|
14
14
|
};
|
|
15
15
|
export type ValidatorId = string | number;
|
|
16
|
-
export type ValidatorStatus
|
|
16
|
+
export type { ValidatorStatus };
|
|
17
17
|
export declare const RandaoResponseType: ContainerType<{
|
|
18
18
|
randao: import("@chainsafe/ssz").ByteVectorType;
|
|
19
19
|
}>;
|
|
20
20
|
export declare const FinalityCheckpointsType: ContainerType<{
|
|
21
21
|
previousJustified: ContainerType<{
|
|
22
22
|
epoch: import("@chainsafe/ssz").UintNumberType;
|
|
23
|
-
root: import("@chainsafe/ssz").ByteVectorType;
|
|
23
|
+
root: import("@chainsafe/ssz").ByteVectorType;
|
|
24
24
|
}>;
|
|
25
25
|
currentJustified: ContainerType<{
|
|
26
26
|
epoch: import("@chainsafe/ssz").UintNumberType;
|
|
27
|
-
root: import("@chainsafe/ssz").ByteVectorType;
|
|
27
|
+
root: import("@chainsafe/ssz").ByteVectorType;
|
|
28
28
|
}>;
|
|
29
29
|
finalized: ContainerType<{
|
|
30
30
|
epoch: import("@chainsafe/ssz").UintNumberType;
|
|
31
|
-
root: import("@chainsafe/ssz").ByteVectorType;
|
|
31
|
+
root: import("@chainsafe/ssz").ByteVectorType;
|
|
32
32
|
}>;
|
|
33
33
|
}>;
|
|
34
34
|
export declare const ValidatorResponseType: ContainerType<{
|
|
@@ -37,6 +37,11 @@ export declare const ValidatorResponseType: ContainerType<{
|
|
|
37
37
|
status: StringType<ValidatorStatus>;
|
|
38
38
|
validator: import("@lodestar/types/lib/phase0/validator.js").ValidatorNodeStructType;
|
|
39
39
|
}>;
|
|
40
|
+
export declare const ValidatorIdentityType: ContainerType<{
|
|
41
|
+
index: import("@chainsafe/ssz").UintNumberType;
|
|
42
|
+
pubkey: import("@chainsafe/ssz").ByteVectorType;
|
|
43
|
+
activationEpoch: import("@chainsafe/ssz").UintNumberType;
|
|
44
|
+
}>;
|
|
40
45
|
export declare const EpochCommitteeResponseType: ContainerType<{
|
|
41
46
|
index: import("@chainsafe/ssz").UintNumberType;
|
|
42
47
|
slot: import("@chainsafe/ssz").UintNumberType;
|
|
@@ -58,6 +63,11 @@ export declare const ValidatorResponseListType: import("@chainsafe/ssz").ArrayTy
|
|
|
58
63
|
status: StringType<ValidatorStatus>;
|
|
59
64
|
validator: import("@lodestar/types/lib/phase0/validator.js").ValidatorNodeStructType;
|
|
60
65
|
}>>, unknown, unknown>;
|
|
66
|
+
export declare const ValidatorIdentitiesType: import("@chainsafe/ssz").ArrayType<import("@chainsafe/ssz").Type<import("@chainsafe/ssz").ValueOfFields<{
|
|
67
|
+
index: import("@chainsafe/ssz").UintNumberType;
|
|
68
|
+
pubkey: import("@chainsafe/ssz").ByteVectorType;
|
|
69
|
+
activationEpoch: import("@chainsafe/ssz").UintNumberType;
|
|
70
|
+
}>>, unknown, unknown>;
|
|
61
71
|
export declare const EpochCommitteeResponseListType: import("@chainsafe/ssz").ArrayType<import("@chainsafe/ssz").Type<import("@chainsafe/ssz").ValueOfFields<{
|
|
62
72
|
index: import("@chainsafe/ssz").UintNumberType;
|
|
63
73
|
slot: import("@chainsafe/ssz").UintNumberType;
|
|
@@ -74,6 +84,7 @@ export type EpochCommitteeResponse = ValueOf<typeof EpochCommitteeResponseType>;
|
|
|
74
84
|
export type ValidatorBalance = ValueOf<typeof ValidatorBalanceType>;
|
|
75
85
|
export type EpochSyncCommitteeResponse = ValueOf<typeof EpochSyncCommitteeResponseType>;
|
|
76
86
|
export type ValidatorResponseList = ValueOf<typeof ValidatorResponseListType>;
|
|
87
|
+
export type ValidatorIdentities = ValueOf<typeof ValidatorIdentitiesType>;
|
|
77
88
|
export type EpochCommitteeResponseList = ValueOf<typeof EpochCommitteeResponseListType>;
|
|
78
89
|
export type ValidatorBalanceList = ValueOf<typeof ValidatorBalanceListType>;
|
|
79
90
|
export type Endpoints = {
|
|
@@ -171,6 +182,24 @@ export type Endpoints = {
|
|
|
171
182
|
statuses?: ValidatorStatus[];
|
|
172
183
|
};
|
|
173
184
|
}, ValidatorResponseList, ExecutionOptimisticAndFinalizedMeta>;
|
|
185
|
+
/**
|
|
186
|
+
* Get validator identities from state
|
|
187
|
+
*
|
|
188
|
+
* Returns filterable list of validators identities.
|
|
189
|
+
*
|
|
190
|
+
* Identities will be returned for all indices or public keys that match known validators. If an index or public key does not
|
|
191
|
+
* match any known validator, no identity will be returned but this will not cause an error. There are no guarantees for the
|
|
192
|
+
* returned data in terms of ordering.
|
|
193
|
+
*/
|
|
194
|
+
postStateValidatorIdentities: Endpoint<"POST", StateArgs & {
|
|
195
|
+
/** An array of values, with each value either a hex encoded public key (any bytes48 with 0x prefix) or a validator index */
|
|
196
|
+
validatorIds?: ValidatorId[];
|
|
197
|
+
}, {
|
|
198
|
+
params: {
|
|
199
|
+
state_id: string;
|
|
200
|
+
};
|
|
201
|
+
body: string[];
|
|
202
|
+
}, ValidatorIdentities, ExecutionOptimisticAndFinalizedMeta>;
|
|
174
203
|
/**
|
|
175
204
|
* Get validator balances from state
|
|
176
205
|
* Returns filterable list of validator balances.
|
|
@@ -22,6 +22,11 @@ export const ValidatorResponseType = new ContainerType({
|
|
|
22
22
|
status: new StringType(),
|
|
23
23
|
validator: ssz.phase0.Validator,
|
|
24
24
|
});
|
|
25
|
+
export const ValidatorIdentityType = new ContainerType({
|
|
26
|
+
index: ssz.ValidatorIndex,
|
|
27
|
+
pubkey: ssz.BLSPubkey,
|
|
28
|
+
activationEpoch: ssz.UintNum64,
|
|
29
|
+
}, { jsonCase: "eth2" });
|
|
25
30
|
export const EpochCommitteeResponseType = new ContainerType({
|
|
26
31
|
index: ssz.CommitteeIndex,
|
|
27
32
|
slot: ssz.Slot,
|
|
@@ -39,6 +44,7 @@ export const EpochSyncCommitteeResponseType = new ContainerType({
|
|
|
39
44
|
validatorAggregates: ArrayOf(ArrayOf(ssz.ValidatorIndex)),
|
|
40
45
|
}, { jsonCase: "eth2" });
|
|
41
46
|
export const ValidatorResponseListType = ArrayOf(ValidatorResponseType);
|
|
47
|
+
export const ValidatorIdentitiesType = ArrayOf(ValidatorIdentityType);
|
|
42
48
|
export const EpochCommitteeResponseListType = ArrayOf(EpochCommitteeResponseType);
|
|
43
49
|
export const ValidatorBalanceListType = ArrayOf(ValidatorBalanceType);
|
|
44
50
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -195,6 +201,28 @@ export function getDefinitions(_config) {
|
|
|
195
201
|
meta: ExecutionOptimisticAndFinalizedCodec,
|
|
196
202
|
},
|
|
197
203
|
},
|
|
204
|
+
postStateValidatorIdentities: {
|
|
205
|
+
url: "/eth/v1/beacon/states/{state_id}/validator_identities",
|
|
206
|
+
method: "POST",
|
|
207
|
+
req: JsonOnlyReq({
|
|
208
|
+
writeReqJson: ({ stateId, validatorIds }) => ({
|
|
209
|
+
params: { state_id: stateId.toString() },
|
|
210
|
+
body: toValidatorIdsStr(validatorIds) || [],
|
|
211
|
+
}),
|
|
212
|
+
parseReqJson: ({ params, body = [] }) => ({
|
|
213
|
+
stateId: params.state_id,
|
|
214
|
+
validatorIds: fromValidatorIdsStr(body),
|
|
215
|
+
}),
|
|
216
|
+
schema: {
|
|
217
|
+
params: { state_id: Schema.StringRequired },
|
|
218
|
+
body: Schema.UintOrStringArray,
|
|
219
|
+
},
|
|
220
|
+
}),
|
|
221
|
+
resp: {
|
|
222
|
+
data: ValidatorIdentitiesType,
|
|
223
|
+
meta: ExecutionOptimisticAndFinalizedCodec,
|
|
224
|
+
},
|
|
225
|
+
},
|
|
198
226
|
getStateValidatorBalances: {
|
|
199
227
|
url: "/eth/v1/beacon/states/{state_id}/validator_balances",
|
|
200
228
|
method: "GET",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/beacon/routes/beacon/state.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,OAAO,EAAC,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAC,4BAA4B,EAAC,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAsC,GAAG,EAAW,UAAU,
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/beacon/routes/beacon/state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,30 @@
|
|
|
1
|
-
import { Type, ValueOf } from "@chainsafe/ssz";
|
|
1
|
+
import { ContainerType, Type, ValueOf } from "@chainsafe/ssz";
|
|
2
2
|
import { ChainForkConfig } from "@lodestar/config";
|
|
3
3
|
import { StringType, BeaconState } from "@lodestar/types";
|
|
4
4
|
import { EmptyArgs, EmptyMeta, EmptyRequest } from "../../utils/codecs.js";
|
|
5
5
|
import { ExecutionOptimisticFinalizedAndVersionMeta } from "../../utils/metadata.js";
|
|
6
6
|
import { Endpoint, RouteDefinitions } from "../../utils/types.js";
|
|
7
7
|
import { StateArgs } from "./beacon/state.js";
|
|
8
|
+
declare const ForkChoiceResponseType: ContainerType<{
|
|
9
|
+
justifiedCheckpoint: ContainerType<{
|
|
10
|
+
epoch: import("@chainsafe/ssz").UintNumberType;
|
|
11
|
+
root: import("@chainsafe/ssz").ByteVectorType;
|
|
12
|
+
}>;
|
|
13
|
+
finalizedCheckpoint: ContainerType<{
|
|
14
|
+
epoch: import("@chainsafe/ssz").UintNumberType;
|
|
15
|
+
root: import("@chainsafe/ssz").ByteVectorType;
|
|
16
|
+
}>;
|
|
17
|
+
forkChoiceNodes: import("@chainsafe/ssz").ArrayType<Type<import("@chainsafe/ssz").ValueOfFields<{
|
|
18
|
+
slot: import("@chainsafe/ssz").UintNumberType;
|
|
19
|
+
blockRoot: StringType<string>;
|
|
20
|
+
parentRoot: StringType<string>;
|
|
21
|
+
justifiedEpoch: import("@chainsafe/ssz").UintNumberType;
|
|
22
|
+
finalizedEpoch: import("@chainsafe/ssz").UintNumberType;
|
|
23
|
+
weight: import("@chainsafe/ssz").UintNumberType;
|
|
24
|
+
validity: StringType<"valid" | "invalid" | "optimistic">;
|
|
25
|
+
executionBlockHash: StringType<string>;
|
|
26
|
+
}>>, unknown, unknown>;
|
|
27
|
+
}>;
|
|
8
28
|
declare const ProtoNodeListType: import("@chainsafe/ssz").ArrayType<Type<import("@chainsafe/ssz").ValueOfFields<{
|
|
9
29
|
executionPayloadBlockHash: StringType<string>;
|
|
10
30
|
executionPayloadNumber: import("@chainsafe/ssz").UintNumberType;
|
|
@@ -35,11 +55,16 @@ declare const DebugChainHeadListType: import("@chainsafe/ssz").ArrayType<Type<im
|
|
|
35
55
|
}>>, unknown, unknown>;
|
|
36
56
|
type ProtoNodeList = ValueOf<typeof ProtoNodeListType>;
|
|
37
57
|
type DebugChainHeadList = ValueOf<typeof DebugChainHeadListType>;
|
|
58
|
+
type ForkChoiceResponse = ValueOf<typeof ForkChoiceResponseType>;
|
|
38
59
|
export type Endpoints = {
|
|
39
60
|
/**
|
|
40
61
|
* Retrieves all possible chain heads (leaves of fork choice tree).
|
|
41
62
|
*/
|
|
42
63
|
getDebugChainHeadsV2: Endpoint<"GET", EmptyArgs, EmptyRequest, DebugChainHeadList, EmptyMeta>;
|
|
64
|
+
/**
|
|
65
|
+
* Retrieves all current fork choice context
|
|
66
|
+
*/
|
|
67
|
+
getDebugForkChoice: Endpoint<"GET", EmptyArgs, EmptyRequest, ForkChoiceResponse, EmptyMeta>;
|
|
43
68
|
/**
|
|
44
69
|
* Dump all ProtoArray's nodes to debug
|
|
45
70
|
*/
|
|
@@ -35,6 +35,21 @@ const DebugChainHeadType = new ContainerType({
|
|
|
35
35
|
root: stringType,
|
|
36
36
|
executionOptimistic: ssz.Boolean,
|
|
37
37
|
}, { jsonCase: "eth2" });
|
|
38
|
+
const ForkChoiceNodeType = new ContainerType({
|
|
39
|
+
slot: ssz.Slot,
|
|
40
|
+
blockRoot: stringType,
|
|
41
|
+
parentRoot: stringType,
|
|
42
|
+
justifiedEpoch: ssz.Epoch,
|
|
43
|
+
finalizedEpoch: ssz.Epoch,
|
|
44
|
+
weight: ssz.UintNum64,
|
|
45
|
+
validity: new StringType(),
|
|
46
|
+
executionBlockHash: stringType,
|
|
47
|
+
}, { jsonCase: "eth2" });
|
|
48
|
+
const ForkChoiceResponseType = new ContainerType({
|
|
49
|
+
justifiedCheckpoint: ssz.phase0.Checkpoint,
|
|
50
|
+
finalizedCheckpoint: ssz.phase0.Checkpoint,
|
|
51
|
+
forkChoiceNodes: ArrayOf(ForkChoiceNodeType),
|
|
52
|
+
}, { jsonCase: "eth2" });
|
|
38
53
|
const ProtoNodeListType = ArrayOf(ProtoNodeType);
|
|
39
54
|
const DebugChainHeadListType = ArrayOf(DebugChainHeadType);
|
|
40
55
|
export function getDefinitions(_config) {
|
|
@@ -49,6 +64,24 @@ export function getDefinitions(_config) {
|
|
|
49
64
|
onlySupport: WireFormat.json,
|
|
50
65
|
},
|
|
51
66
|
},
|
|
67
|
+
getDebugForkChoice: {
|
|
68
|
+
url: "/eth/v1/debug/fork_choice",
|
|
69
|
+
method: "GET",
|
|
70
|
+
req: EmptyRequestCodec,
|
|
71
|
+
resp: {
|
|
72
|
+
data: ForkChoiceResponseType,
|
|
73
|
+
meta: EmptyMetaCodec,
|
|
74
|
+
onlySupport: WireFormat.json,
|
|
75
|
+
transform: {
|
|
76
|
+
toResponse: (data) => ({
|
|
77
|
+
...data,
|
|
78
|
+
}),
|
|
79
|
+
fromResponse: (resp) => ({
|
|
80
|
+
data: resp,
|
|
81
|
+
}),
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
},
|
|
52
85
|
getProtoArrayNodes: {
|
|
53
86
|
url: "/eth/v0/debug/forkchoice",
|
|
54
87
|
method: "GET",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/beacon/routes/debug.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,OAAO,EAAC,aAAa,EAAgB,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAC,GAAG,EAAE,UAAU,EAAc,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EACL,OAAO,EAEP,iBAAiB,EAEjB,cAAc,EAEd,WAAW,GACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,2CAA2C,GAE5C,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAG7C,yFAAyF;AAEzF,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;AACpC,MAAM,aAAa,GAAG,IAAI,aAAa,CACrC;IACE,yBAAyB,EAAE,UAAU;IACrC,sBAAsB,EAAE,GAAG,CAAC,SAAS;IACrC,eAAe,EAAE,UAAU;IAC3B,IAAI,EAAE,GAAG,CAAC,IAAI;IACd,SAAS,EAAE,UAAU;IACrB,UAAU,EAAE,UAAU;IACtB,SAAS,EAAE,UAAU;IACrB,UAAU,EAAE,UAAU;IACtB,UAAU,EAAE,GAAG,CAAC,OAAO;IACvB,cAAc,EAAE,GAAG,CAAC,KAAK;IACzB,aAAa,EAAE,UAAU;IACzB,cAAc,EAAE,GAAG,CAAC,KAAK;IACzB,aAAa,EAAE,UAAU;IACzB,wBAAwB,EAAE,GAAG,CAAC,KAAK;IACnC,uBAAuB,EAAE,UAAU;IACnC,wBAAwB,EAAE,GAAG,CAAC,KAAK;IACnC,uBAAuB,EAAE,UAAU;IACnC,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,GAAG,CAAC,MAAM;IAClB,SAAS,EAAE,UAAU;IACrB,cAAc,EAAE,UAAU;CAC3B,EACD,EAAC,QAAQ,EAAE,MAAM,EAAC,CACnB,CAAC;AACF,MAAM,kBAAkB,GAAG,IAAI,aAAa,CAC1C;IACE,IAAI,EAAE,GAAG,CAAC,IAAI;IACd,IAAI,EAAE,UAAU;IAChB,mBAAmB,EAAE,GAAG,CAAC,OAAO;CACjC,EACD,EAAC,QAAQ,EAAE,MAAM,EAAC,CACnB,CAAC;AAEF,MAAM,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACjD,MAAM,sBAAsB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../src/beacon/routes/debug.ts"],"names":[],"mappings":"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"}
|
|
@@ -153,6 +153,9 @@ export class ApiResponse extends Response {
|
|
|
153
153
|
try {
|
|
154
154
|
const errJson = JSON.parse(errBody);
|
|
155
155
|
if (errJson.message) {
|
|
156
|
+
if (errJson.failures) {
|
|
157
|
+
return `${errJson.message}\n` + errJson.failures.map((e) => e.message).join("\n");
|
|
158
|
+
}
|
|
156
159
|
return errJson.message;
|
|
157
160
|
}
|
|
158
161
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/utils/client/response.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"response.js","sourceRoot":"","sources":["../../../src/utils/client/response.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/schema.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { MediaType } from "./headers.js";
|
|
1
2
|
export var Schema;
|
|
2
3
|
(function (Schema) {
|
|
3
4
|
Schema[Schema["Uint"] = 0] = "Uint";
|
|
@@ -58,7 +59,16 @@ function isRequired(schema) {
|
|
|
58
59
|
export function getFastifySchema(schemaDef) {
|
|
59
60
|
const schema = {};
|
|
60
61
|
if (schemaDef.body != null) {
|
|
61
|
-
schema.body =
|
|
62
|
+
schema.body = {
|
|
63
|
+
content: {
|
|
64
|
+
[MediaType.json]: {
|
|
65
|
+
schema: getJsonSchemaItem(schemaDef.body),
|
|
66
|
+
},
|
|
67
|
+
[MediaType.ssz]: {
|
|
68
|
+
schema: {},
|
|
69
|
+
},
|
|
70
|
+
},
|
|
71
|
+
};
|
|
62
72
|
}
|
|
63
73
|
if (schemaDef.params) {
|
|
64
74
|
schema.params = { type: "object", required: [], properties: {} };
|
package/lib/utils/schema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/utils/schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/utils/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,6 @@
|
|
|
1
1
|
import { MediaType } from "../headers.js";
|
|
2
2
|
export function addSszContentTypeParser(server) {
|
|
3
|
-
|
|
4
|
-
let bodySchemaSymbol;
|
|
5
|
-
server.addContentTypeParser(MediaType.ssz, { parseAs: "buffer" }, async (request, payload) => {
|
|
6
|
-
if (bodySchemaSymbol === undefined) {
|
|
7
|
-
// Get body schema symbol to be able to access validation function
|
|
8
|
-
// https://github.com/fastify/fastify/blob/af2ccb5ff681c1d0ac22eb7314c6fa803f73c873/lib/symbols.js#L25
|
|
9
|
-
bodySchemaSymbol = Object.getOwnPropertySymbols(request.context).find((s) => s.description === "body-schema");
|
|
10
|
-
}
|
|
11
|
-
// JSON schema validation will be applied to `Buffer` object, it is required to override validation function
|
|
12
|
-
// See https://github.com/fastify/help/issues/1012, it is not possible right now to define a schema per content type
|
|
13
|
-
request.context[bodySchemaSymbol] = () => true;
|
|
3
|
+
server.addContentTypeParser(MediaType.ssz, { parseAs: "buffer" }, async (_request, payload) => {
|
|
14
4
|
// We could just return the `Buffer` here which is a subclass of `Uint8Array` but downstream code does not require it
|
|
15
5
|
// and it's better to convert it here to avoid unexpected behavior such as `Buffer.prototype.slice` not copying memory
|
|
16
6
|
// See https://github.com/nodejs/node/issues/41588#issuecomment-1016269584
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/utils/server/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;AAExC,MAAM,UAAU,uBAAuB,CAAC,MAA+B;IACrE,
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../src/utils/server/parser.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;AAExC,MAAM,UAAU,uBAAuB,CAAC,MAA+B;IACrE,MAAM,CAAC,oBAAoB,CACzB,SAAS,CAAC,GAAG,EACb,EAAC,OAAO,EAAE,QAAQ,EAAC,EACnB,KAAK,EAAE,QAAgC,EAAE,OAAe,EAAE,EAAE;QAC1D,qHAAqH;QACrH,sHAAsH;QACtH,0EAA0E;QAC1E,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAChF,CAAC,CACF,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.23.0-dev.
|
|
14
|
+
"version": "1.23.0-dev.d44c409eaa",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -72,10 +72,10 @@
|
|
|
72
72
|
"dependencies": {
|
|
73
73
|
"@chainsafe/persistent-merkle-tree": "^0.8.0",
|
|
74
74
|
"@chainsafe/ssz": "^0.17.1",
|
|
75
|
-
"@lodestar/config": "1.23.0-dev.
|
|
76
|
-
"@lodestar/params": "1.23.0-dev.
|
|
77
|
-
"@lodestar/types": "1.23.0-dev.
|
|
78
|
-
"@lodestar/utils": "1.23.0-dev.
|
|
75
|
+
"@lodestar/config": "1.23.0-dev.d44c409eaa",
|
|
76
|
+
"@lodestar/params": "1.23.0-dev.d44c409eaa",
|
|
77
|
+
"@lodestar/types": "1.23.0-dev.d44c409eaa",
|
|
78
|
+
"@lodestar/utils": "1.23.0-dev.d44c409eaa",
|
|
79
79
|
"eventsource": "^2.0.2",
|
|
80
80
|
"qs": "^6.11.1"
|
|
81
81
|
},
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"@types/eventsource": "^1.1.11",
|
|
84
84
|
"@types/qs": "^6.9.7",
|
|
85
85
|
"ajv": "^8.12.0",
|
|
86
|
-
"fastify": "^
|
|
86
|
+
"fastify": "^5.0.0"
|
|
87
87
|
},
|
|
88
88
|
"keywords": [
|
|
89
89
|
"ethereum",
|
|
@@ -92,5 +92,5 @@
|
|
|
92
92
|
"api",
|
|
93
93
|
"blockchain"
|
|
94
94
|
],
|
|
95
|
-
"gitHead": "
|
|
95
|
+
"gitHead": "53a5f67fbf595c30856b7dec2be55749be83b964"
|
|
96
96
|
}
|