@lodestar/api 1.42.0-dev.efc1ab8e31 → 1.42.0-dev.f866249fa3
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.
|
@@ -12,13 +12,20 @@ export declare const blobSidecarSSE: ContainerType<{
|
|
|
12
12
|
versionedHash: StringType<string>;
|
|
13
13
|
}>;
|
|
14
14
|
type BlobSidecarSSE = ValueOf<typeof blobSidecarSSE>;
|
|
15
|
-
export declare const
|
|
15
|
+
export declare const fuluDataColumnSidecarSSE: ContainerType<{
|
|
16
16
|
blockRoot: StringType<string>;
|
|
17
17
|
index: import("@chainsafe/ssz").UintNumberType;
|
|
18
18
|
slot: import("@chainsafe/ssz").UintNumberType;
|
|
19
19
|
kzgCommitments: ListBasicType<StringType<string>>;
|
|
20
20
|
}>;
|
|
21
|
-
|
|
21
|
+
declare const gloasDataColumnSidecarSSE: ContainerType<{
|
|
22
|
+
blockRoot: StringType<string>;
|
|
23
|
+
index: import("@chainsafe/ssz").UintNumberType;
|
|
24
|
+
slot: import("@chainsafe/ssz").UintNumberType;
|
|
25
|
+
}>;
|
|
26
|
+
type FuluDataColumnSidecarSSE = ValueOf<typeof fuluDataColumnSidecarSSE>;
|
|
27
|
+
type GloasDataColumnSidecarSSE = ValueOf<typeof gloasDataColumnSidecarSSE>;
|
|
28
|
+
type DataColumnSidecarSSE = FuluDataColumnSidecarSSE | GloasDataColumnSidecarSSE;
|
|
22
29
|
export declare enum EventType {
|
|
23
30
|
/**
|
|
24
31
|
* The node has finished processing, resulting in a new head. previous_duty_dependent_root is
|
|
@@ -357,11 +364,6 @@ export declare function getEventSerdes(config: ChainForkConfig): {
|
|
|
357
364
|
slot: import("@chainsafe/ssz").UintNumberType;
|
|
358
365
|
kzgCommitment: StringType<string>;
|
|
359
366
|
versionedHash: StringType<string>;
|
|
360
|
-
}> | import("@chainsafe/ssz").ValueOfFields<{
|
|
361
|
-
blockRoot: StringType<string>;
|
|
362
|
-
index: import("@chainsafe/ssz").UintNumberType;
|
|
363
|
-
slot: import("@chainsafe/ssz").UintNumberType;
|
|
364
|
-
kzgCommitments: ListBasicType<StringType<string>>;
|
|
365
367
|
}> | {
|
|
366
368
|
slot: number;
|
|
367
369
|
block: string;
|
|
@@ -814,7 +816,7 @@ export declare function getEventSerdes(config: ChainForkConfig): {
|
|
|
814
816
|
} | {
|
|
815
817
|
slot: number;
|
|
816
818
|
blockRoot: string;
|
|
817
|
-
};
|
|
819
|
+
} | DataColumnSidecarSSE;
|
|
818
820
|
};
|
|
819
821
|
export {};
|
|
820
822
|
//# sourceMappingURL=events.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/beacon/routes/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/beacon/routes/events.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ContainerType, ListBasicType } from "@chainsafe/ssz";
|
|
2
|
-
import { MAX_BLOB_COMMITMENTS_PER_BLOCK } from "@lodestar/params";
|
|
2
|
+
import { MAX_BLOB_COMMITMENTS_PER_BLOCK, isForkPostGloas } from "@lodestar/params";
|
|
3
3
|
import { StringType, ssz, sszTypesFor, } from "@lodestar/types";
|
|
4
4
|
import { EmptyResponseCodec } from "../../utils/codecs.js";
|
|
5
5
|
import { getPostAltairForkTypes, getPostBellatrixForkTypes } from "../../utils/fork.js";
|
|
@@ -13,12 +13,17 @@ export const blobSidecarSSE = new ContainerType({
|
|
|
13
13
|
kzgCommitment: stringType,
|
|
14
14
|
versionedHash: stringType,
|
|
15
15
|
}, { typeName: "BlobSidecarSSE", jsonCase: "eth2" });
|
|
16
|
-
export const
|
|
16
|
+
export const fuluDataColumnSidecarSSE = new ContainerType({
|
|
17
17
|
blockRoot: stringType,
|
|
18
18
|
index: ssz.ColumnIndex,
|
|
19
19
|
slot: ssz.Slot,
|
|
20
20
|
kzgCommitments: new ListBasicType(stringType, MAX_BLOB_COMMITMENTS_PER_BLOCK),
|
|
21
21
|
}, { typeName: "DataColumnSidecarSSE", jsonCase: "eth2" });
|
|
22
|
+
const gloasDataColumnSidecarSSE = new ContainerType({
|
|
23
|
+
blockRoot: stringType,
|
|
24
|
+
index: ssz.ColumnIndex,
|
|
25
|
+
slot: ssz.Slot,
|
|
26
|
+
}, { typeName: "DataColumnSidecarSSE", jsonCase: "eth2" });
|
|
22
27
|
export { EventType };
|
|
23
28
|
var EventType;
|
|
24
29
|
(function (EventType) {
|
|
@@ -184,7 +189,22 @@ export function getTypeByEvent(config) {
|
|
|
184
189
|
[EventType.contributionAndProof]: ssz.altair.SignedContributionAndProof,
|
|
185
190
|
[EventType.payloadAttributes]: WithVersion((fork) => getPostBellatrixForkTypes(fork).SSEPayloadAttributes),
|
|
186
191
|
[EventType.blobSidecar]: blobSidecarSSE,
|
|
187
|
-
[EventType.dataColumnSidecar]:
|
|
192
|
+
[EventType.dataColumnSidecar]: {
|
|
193
|
+
toJson: (data) => {
|
|
194
|
+
const fork = config.getForkName(data.slot);
|
|
195
|
+
if (isForkPostGloas(fork)) {
|
|
196
|
+
return gloasDataColumnSidecarSSE.toJson(data);
|
|
197
|
+
}
|
|
198
|
+
return fuluDataColumnSidecarSSE.toJson(data);
|
|
199
|
+
},
|
|
200
|
+
fromJson: (data) => {
|
|
201
|
+
const fork = config.getForkName(Number(data.slot));
|
|
202
|
+
if (isForkPostGloas(fork)) {
|
|
203
|
+
return gloasDataColumnSidecarSSE.fromJson(data);
|
|
204
|
+
}
|
|
205
|
+
return fuluDataColumnSidecarSSE.fromJson(data);
|
|
206
|
+
},
|
|
207
|
+
},
|
|
188
208
|
[EventType.executionPayload]: new ContainerType({
|
|
189
209
|
slot: ssz.Slot,
|
|
190
210
|
builderIndex: ssz.BuilderIndex,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/beacon/routes/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAW,8BAA8B,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/beacon/routes/events.ts"],"names":[],"mappings":"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"}
|
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.42.0-dev.
|
|
14
|
+
"version": "1.42.0-dev.f866249fa3",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -76,10 +76,10 @@
|
|
|
76
76
|
"dependencies": {
|
|
77
77
|
"@chainsafe/persistent-merkle-tree": "^1.2.1",
|
|
78
78
|
"@chainsafe/ssz": "^1.2.2",
|
|
79
|
-
"@lodestar/config": "^1.42.0-dev.
|
|
80
|
-
"@lodestar/params": "^1.42.0-dev.
|
|
81
|
-
"@lodestar/types": "^1.42.0-dev.
|
|
82
|
-
"@lodestar/utils": "^1.42.0-dev.
|
|
79
|
+
"@lodestar/config": "^1.42.0-dev.f866249fa3",
|
|
80
|
+
"@lodestar/params": "^1.42.0-dev.f866249fa3",
|
|
81
|
+
"@lodestar/types": "^1.42.0-dev.f866249fa3",
|
|
82
|
+
"@lodestar/utils": "^1.42.0-dev.f866249fa3",
|
|
83
83
|
"eventsource": "^2.0.2",
|
|
84
84
|
"qs": "^6.11.1"
|
|
85
85
|
},
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
"api",
|
|
97
97
|
"blockchain"
|
|
98
98
|
],
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "13c4a6850f37b54cbf578258114d64a43f230a35"
|
|
100
100
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {ContainerType, ListBasicType, ValueOf} from "@chainsafe/ssz";
|
|
2
2
|
import {ChainForkConfig} from "@lodestar/config";
|
|
3
|
-
import {ForkName, MAX_BLOB_COMMITMENTS_PER_BLOCK} from "@lodestar/params";
|
|
3
|
+
import {ForkName, MAX_BLOB_COMMITMENTS_PER_BLOCK, isForkPostGloas} from "@lodestar/params";
|
|
4
4
|
import {
|
|
5
5
|
Attestation,
|
|
6
6
|
AttesterSlashing,
|
|
@@ -38,7 +38,7 @@ export const blobSidecarSSE = new ContainerType(
|
|
|
38
38
|
);
|
|
39
39
|
type BlobSidecarSSE = ValueOf<typeof blobSidecarSSE>;
|
|
40
40
|
|
|
41
|
-
export const
|
|
41
|
+
export const fuluDataColumnSidecarSSE = new ContainerType(
|
|
42
42
|
{
|
|
43
43
|
blockRoot: stringType,
|
|
44
44
|
index: ssz.ColumnIndex,
|
|
@@ -47,7 +47,17 @@ export const dataColumnSidecarSSE = new ContainerType(
|
|
|
47
47
|
},
|
|
48
48
|
{typeName: "DataColumnSidecarSSE", jsonCase: "eth2"}
|
|
49
49
|
);
|
|
50
|
-
|
|
50
|
+
const gloasDataColumnSidecarSSE = new ContainerType(
|
|
51
|
+
{
|
|
52
|
+
blockRoot: stringType,
|
|
53
|
+
index: ssz.ColumnIndex,
|
|
54
|
+
slot: ssz.Slot,
|
|
55
|
+
},
|
|
56
|
+
{typeName: "DataColumnSidecarSSE", jsonCase: "eth2"}
|
|
57
|
+
);
|
|
58
|
+
type FuluDataColumnSidecarSSE = ValueOf<typeof fuluDataColumnSidecarSSE>;
|
|
59
|
+
type GloasDataColumnSidecarSSE = ValueOf<typeof gloasDataColumnSidecarSSE>;
|
|
60
|
+
type DataColumnSidecarSSE = FuluDataColumnSidecarSSE | GloasDataColumnSidecarSSE;
|
|
51
61
|
|
|
52
62
|
export enum EventType {
|
|
53
63
|
/**
|
|
@@ -339,7 +349,22 @@ export function getTypeByEvent(config: ChainForkConfig): {[K in EventType]: Type
|
|
|
339
349
|
[EventType.contributionAndProof]: ssz.altair.SignedContributionAndProof,
|
|
340
350
|
[EventType.payloadAttributes]: WithVersion((fork) => getPostBellatrixForkTypes(fork).SSEPayloadAttributes),
|
|
341
351
|
[EventType.blobSidecar]: blobSidecarSSE,
|
|
342
|
-
[EventType.dataColumnSidecar]:
|
|
352
|
+
[EventType.dataColumnSidecar]: {
|
|
353
|
+
toJson: (data) => {
|
|
354
|
+
const fork = config.getForkName(data.slot);
|
|
355
|
+
if (isForkPostGloas(fork)) {
|
|
356
|
+
return gloasDataColumnSidecarSSE.toJson(data);
|
|
357
|
+
}
|
|
358
|
+
return fuluDataColumnSidecarSSE.toJson(data as FuluDataColumnSidecarSSE);
|
|
359
|
+
},
|
|
360
|
+
fromJson: (data) => {
|
|
361
|
+
const fork = config.getForkName(Number((data as DataColumnSidecarSSE).slot));
|
|
362
|
+
if (isForkPostGloas(fork)) {
|
|
363
|
+
return gloasDataColumnSidecarSSE.fromJson(data);
|
|
364
|
+
}
|
|
365
|
+
return fuluDataColumnSidecarSSE.fromJson(data);
|
|
366
|
+
},
|
|
367
|
+
},
|
|
343
368
|
[EventType.executionPayload]: new ContainerType(
|
|
344
369
|
{
|
|
345
370
|
slot: ssz.Slot,
|