@lodestar/api 1.16.0-dev.e0b6e285c3 → 1.16.0-dev.efb684a918
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/client/beacon.js.map +1 -1
- package/lib/builder/client.d.ts +2 -2
- package/lib/builder/client.js.map +1 -1
- package/lib/builder/index.d.ts +4 -3
- package/lib/builder/index.js +1 -1
- package/lib/builder/index.js.map +1 -1
- package/lib/utils/client/client.d.ts +9 -1
- package/lib/utils/client/client.js +15 -3
- package/lib/utils/client/client.js.map +1 -1
- package/lib/utils/client/httpClient.d.ts +2 -0
- package/lib/utils/client/httpClient.js +11 -1
- package/lib/utils/client/httpClient.js.map +1 -1
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"beacon.js","sourceRoot":"","sources":["../../../src/beacon/client/beacon.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,UAAU,EAAE,iBAAiB,EAAE,cAAc,EAAU,MAAM,2BAA2B,CAAC;AAChH,OAAO,EAAc,yBAAyB,EAAE,uBAAuB,EAAC,MAAM,6BAA6B,CAAC;AAI5G;;GAEG;AACH,MAAM,UAAU,SAAS,CAAC,MAAuB,EAAE,UAAuB;IACxE,MAAM,cAAc,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,uDAAuD;IACvD,MAAM,MAAM,GAAG,yBAAyB,CAAgB,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"beacon.js","sourceRoot":"","sources":["../../../src/beacon/client/beacon.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,UAAU,EAAE,iBAAiB,EAAE,cAAc,EAAU,MAAM,2BAA2B,CAAC;AAChH,OAAO,EAAc,yBAAyB,EAAE,uBAAuB,EAAC,MAAM,6BAA6B,CAAC;AAI5G;;GAEG;AACH,MAAM,UAAU,SAAS,CAAC,MAAuB,EAAE,UAAuB;IACxE,MAAM,cAAc,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,uDAAuD;IACvD,MAAM,MAAM,GAAG,yBAAyB,CAAgB,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,CAAQ,CAAC;IACpH,MAAM,mBAAmB,GAAG,uBAAuB,CAAgB,UAAU,EAAE,cAAc,CAAC,CAAC;IAE/F,OAAO;QACL,GAAG,MAAM;QACT,KAAK,CAAC,QAAQ,CAAoC,OAAgB,EAAE,MAAU;YAC5E,IAAI,MAAM,KAAK,KAAK,EAAE;gBACpB,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC;oBACvC,GAAG,mBAAmB,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;iBACjD,CAAC,CAAC;gBACH,OAAO;oBACL,EAAE,EAAE,IAAI;oBACR,QAAQ,EAAE,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;oBAClC,MAAM,EAAE,GAAG,CAAC,MAAM;iBACC,CAAC;aACvB;YACD,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC;QACD,KAAK,CAAC,UAAU,CAAoC,OAAgB,EAAE,MAAU;YAC9E,IAAI,MAAM,KAAK,KAAK,EAAE;gBACpB,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC;oBACvC,GAAG,mBAAmB,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC;iBACnD,CAAC,CAAC;gBACH,OAAO;oBACL,EAAE,EAAE,IAAI;oBACR,QAAQ,EAAE,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;oBAClC,MAAM,EAAE,GAAG,CAAC,MAAM;iBACG,CAAC;aACzB;YACD,OAAO,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/lib/builder/client.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { ChainForkConfig } from "@lodestar/config";
|
|
2
|
-
import { IHttpClient } from "../utils/client/index.js";
|
|
2
|
+
import { IHttpClient, ApiWithExtraOpts } from "../utils/client/index.js";
|
|
3
3
|
import { Api } from "./routes.js";
|
|
4
4
|
/**
|
|
5
5
|
* REST HTTP client for builder routes
|
|
6
6
|
*/
|
|
7
|
-
export declare function getClient(config: ChainForkConfig, httpClient: IHttpClient): Api
|
|
7
|
+
export declare function getClient(config: ChainForkConfig, httpClient: IHttpClient): ApiWithExtraOpts<Api>;
|
|
8
8
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/builder/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,yBAAyB,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/builder/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,yBAAyB,EAAmB,MAAM,0BAA0B,CAAC;AAClG,OAAO,EAAgB,UAAU,EAAE,iBAAiB,EAAE,cAAc,EAAC,MAAM,aAAa,CAAC;AAEzF;;GAEG;AACH,MAAM,UAAU,SAAS,CAAC,MAAuB,EAAE,UAAuB;IACxE,MAAM,cAAc,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,sDAAsD;IACtD,OAAO,yBAAyB,CAAgB,UAAU,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;AACvG,CAAC"}
|
package/lib/builder/index.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { ChainForkConfig } from "@lodestar/config";
|
|
2
|
-
import { HttpClientModules, HttpClientOptions, IHttpClient } from "../utils/client/
|
|
3
|
-
import { Api } from "
|
|
4
|
-
export type
|
|
2
|
+
import { HttpClientModules, HttpClientOptions, IHttpClient, ApiWithExtraOpts } from "../utils/client/index.js";
|
|
3
|
+
import { Api as BuilderApi } from "../builder/routes.js";
|
|
4
|
+
export type Api = ApiWithExtraOpts<BuilderApi>;
|
|
5
5
|
type ClientModules = HttpClientModules & {
|
|
6
6
|
config: ChainForkConfig;
|
|
7
7
|
httpClient?: IHttpClient;
|
|
8
8
|
};
|
|
9
9
|
export declare function getClient(opts: HttpClientOptions, modules: ClientModules): Api;
|
|
10
|
+
export {};
|
|
10
11
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/builder/index.js
CHANGED
package/lib/builder/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/builder/index.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/builder/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,GAKX,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,OAAO,MAAM,aAAa,CAAC;AAYvC,MAAM,UAAU,SAAS,CAAC,IAAuB,EAAE,OAAsB;IACvE,MAAM,EAAC,MAAM,EAAC,GAAG,OAAO,CAAC;IACzB,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,IAAI,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEvE,OAAO,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import { RouteDef, ReqGeneric, ReturnTypes, ReqSerializer, ReqSerializers, RoutesData } from "../types.js";
|
|
2
2
|
import { APIClientHandler } from "../../interfaces.js";
|
|
3
3
|
import { FetchOpts, IHttpClient } from "./httpClient.js";
|
|
4
|
+
type ExtraOpts = {
|
|
5
|
+
retryAttempts?: number;
|
|
6
|
+
};
|
|
7
|
+
type ParamatersWithOptionalExtaOpts<T extends (...args: any) => any> = [...Parameters<T>, ExtraOpts] | Parameters<T>;
|
|
8
|
+
export type ApiWithExtraOpts<T extends Record<string, APIClientHandler>> = {
|
|
9
|
+
[K in keyof T]: (...args: ParamatersWithOptionalExtaOpts<T[K]>) => ReturnType<T[K]>;
|
|
10
|
+
};
|
|
4
11
|
/**
|
|
5
12
|
* Format FetchFn opts from Fn arguments given a route definition and request serializer.
|
|
6
13
|
* For routes that return only JSOn use @see getGenericJsonClient
|
|
@@ -17,5 +24,6 @@ export declare function getFetchOptsSerializers<Api extends Record<string, APICl
|
|
|
17
24
|
*/
|
|
18
25
|
export declare function generateGenericJsonClient<Api extends Record<string, APIClientHandler>, ReqTypes extends {
|
|
19
26
|
[K in keyof Api]: ReqGeneric;
|
|
20
|
-
}>(routesData: RoutesData<Api>, reqSerializers: ReqSerializers<Api, ReqTypes>, returnTypes: ReturnTypes<Api>, fetchFn: IHttpClient): Api
|
|
27
|
+
}>(routesData: RoutesData<Api>, reqSerializers: ReqSerializers<Api, ReqTypes>, returnTypes: ReturnTypes<Api>, fetchFn: IHttpClient): ApiWithExtraOpts<Api>;
|
|
28
|
+
export {};
|
|
21
29
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -3,7 +3,6 @@ import { compileRouteUrlFormater } from "../urlFormat.js";
|
|
|
3
3
|
import { HttpError } from "./httpClient.js";
|
|
4
4
|
import { HttpStatusCode } from "./httpStatusCode.js";
|
|
5
5
|
// See /packages/api/src/routes/index.ts for reasoning
|
|
6
|
-
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
7
6
|
/**
|
|
8
7
|
* Format FetchFn opts from Fn arguments given a route definition and request serializer.
|
|
9
8
|
* For routes that return only JSOn use @see getGenericJsonClient
|
|
@@ -39,8 +38,18 @@ export function generateGenericJsonClient(routesData, reqSerializers, returnType
|
|
|
39
38
|
const returnType = returnTypes[routeId];
|
|
40
39
|
return async function request(...args) {
|
|
41
40
|
try {
|
|
41
|
+
// extract the extraOpts if provided
|
|
42
|
+
//
|
|
43
|
+
const argLen = args?.length ?? 0;
|
|
44
|
+
const lastArg = args[argLen];
|
|
45
|
+
const retryAttempts = lastArg?.retryAttempts;
|
|
46
|
+
const extraOpts = { retryAttempts };
|
|
42
47
|
if (returnType) {
|
|
43
|
-
|
|
48
|
+
// open extraOpts first if some serializer wants to add some overriding param
|
|
49
|
+
const res = await fetchFn.json({
|
|
50
|
+
...extraOpts,
|
|
51
|
+
...fetchOptsSerializer(...args),
|
|
52
|
+
});
|
|
44
53
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/return-await
|
|
45
54
|
return { ok: true, response: returnType.fromJson(res.body), status: res.status };
|
|
46
55
|
}
|
|
@@ -48,7 +57,10 @@ export function generateGenericJsonClient(routesData, reqSerializers, returnType
|
|
|
48
57
|
// We need to avoid parsing the response as the servers might just
|
|
49
58
|
// response status 200 and close the request instead of writing an
|
|
50
59
|
// empty json response. We return the status code.
|
|
51
|
-
const res = await fetchFn.request(
|
|
60
|
+
const res = await fetchFn.request({
|
|
61
|
+
...extraOpts,
|
|
62
|
+
...fetchOptsSerializer(...args),
|
|
63
|
+
});
|
|
52
64
|
// eslint-disable-next-line @typescript-eslint/return-await
|
|
53
65
|
return { ok: true, response: undefined, status: res.status };
|
|
54
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAC,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAGxD,OAAO,EAAY,SAAS,EAAc,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/utils/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAC,uBAAuB,EAAC,MAAM,iBAAiB,CAAC;AAGxD,OAAO,EAAY,SAAS,EAAc,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAWnD,sDAAsD;AAEtD;;;GAGG;AACH,4EAA4E;AAC5E,MAAM,UAAU,sBAAsB,CACpC,QAAkB,EAClB,aAAyC,EACzC,OAAe;IAEf,MAAM,WAAW,GAAG,uBAAuB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAE1D,OAAO,SAAS,YAAY,CAAC,GAAG,IAAoB;QAClD,MAAM,GAAG,GAAG,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QAC5C,OAAO;YACL,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YAClC,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YAClE,IAAI,EAAE,GAAG,CAAC,IAAe;YACzB,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,OAAO;SACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,4EAA4E;AAC5E,MAAM,UAAU,uBAAuB,CAGrC,UAA2B,EAAE,cAA6C;IAC1E,OAAO,SAAS,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CACjD,sBAAsB,CAAC,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,OAAiB,CAAC,CAC7E,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAIvC,UAA2B,EAC3B,cAA6C,EAC7C,WAA6B,EAC7B,OAAoB;IAEpB,OAAO,SAAS,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE;QACjD,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE,OAAiB,CAAC,CAAC;QACzG,MAAM,UAAU,GAAG,WAAW,CAAC,OAAiC,CAAyB,CAAC;QAE1F,OAAO,KAAK,UAAU,OAAO,CAC3B,GAAG,IAAoD;YAEvD,IAAI;gBACF,oCAAoC;gBACpC,EAAE;gBACF,MAAM,MAAM,GAAI,IAAc,EAAE,MAAM,IAAI,CAAC,CAAC;gBAC5C,MAAM,OAAO,GAAI,IAAc,CAAC,MAAM,CAA0B,CAAC;gBACjE,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,CAAC;gBAC7C,MAAM,SAAS,GAAG,EAAC,aAAa,EAAC,CAAC;gBAElC,IAAI,UAAU,EAAE;oBACd,6EAA6E;oBAC7E,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAU;wBACtC,GAAG,SAAS;wBACZ,GAAG,mBAAmB,CAAC,GAAI,IAAmC,CAAC;qBAChE,CAAC,CAAC;oBACH,oGAAoG;oBACpG,OAAO,EAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAA+B,CAAC;iBAC9G;qBAAM;oBACL,kEAAkE;oBAClE,kEAAkE;oBAClE,kDAAkD;oBAClD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;wBAChC,GAAG,SAAS;wBACZ,GAAG,mBAAmB,CAAC,GAAI,IAAmC,CAAC;qBAChE,CAAC,CAAC;oBAEH,2DAA2D;oBAC3D,OAAO,EAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAA+B,CAAC;iBAC1F;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,GAAG,YAAY,SAAS,EAAE;oBAC5B,OAAO;wBACL,EAAE,EAAE,KAAK;wBACT,MAAM,EAAE,GAAG,CAAC,MAAM;wBAClB,KAAK,EAAE,EAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAC;qBACxC,CAAC;iBACjC;gBAED,IAAI,GAAG,YAAY,YAAY,EAAE;oBAC/B,OAAO;wBACL,EAAE,EAAE,KAAK;wBACT,MAAM,EAAE,cAAc,CAAC,qBAAqB;wBAC5C,KAAK,EAAE,EAAC,IAAI,EAAE,cAAc,CAAC,qBAAqB,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAC;qBAClE,CAAC;iBACjC;gBAED,MAAM,GAAG,CAAC;aACX;QACH,CAAC,CAAC;IACJ,CAAC,CAAqC,CAAC;AACzC,CAAC"}
|
|
@@ -31,6 +31,7 @@ export type FetchOpts = {
|
|
|
31
31
|
/** Optional, for metrics */
|
|
32
32
|
routeId?: string;
|
|
33
33
|
timeoutMs?: number;
|
|
34
|
+
retryAttempts?: number;
|
|
34
35
|
};
|
|
35
36
|
export interface IHttpClient {
|
|
36
37
|
baseUrl: string;
|
|
@@ -93,6 +94,7 @@ export declare class HttpClient implements IHttpClient {
|
|
|
93
94
|
body: ArrayBuffer;
|
|
94
95
|
}>;
|
|
95
96
|
private requestWithBodyWithRetries;
|
|
97
|
+
private requestWithBodyWithFallbacks;
|
|
96
98
|
private requestWithBody;
|
|
97
99
|
}
|
|
98
100
|
//# sourceMappingURL=httpClient.d.ts.map
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ErrorAborted, TimeoutError, isValidHttpUrl, toBase64 } from "@lodestar/utils";
|
|
1
|
+
import { ErrorAborted, TimeoutError, isValidHttpUrl, toBase64, retry } from "@lodestar/utils";
|
|
2
2
|
import { fetch, isFetchError } from "./fetch.js";
|
|
3
3
|
import { stringifyQuery, urlJoin } from "./format.js";
|
|
4
4
|
/** A higher default timeout, validator will sets its own shorter timeoutMs */
|
|
@@ -97,6 +97,16 @@ export class HttpClient {
|
|
|
97
97
|
return this.requestWithBodyWithRetries(opts, (res) => res.arrayBuffer());
|
|
98
98
|
}
|
|
99
99
|
async requestWithBodyWithRetries(opts, getBody) {
|
|
100
|
+
if (opts.retryAttempts !== undefined) {
|
|
101
|
+
return retry(async (_attempt) => {
|
|
102
|
+
return this.requestWithBodyWithFallbacks(opts, getBody);
|
|
103
|
+
}, { retries: opts.retryAttempts, retryDelay: 200 });
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
return this.requestWithBodyWithFallbacks(opts, getBody);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
async requestWithBodyWithFallbacks(opts, getBody) {
|
|
100
110
|
// Early return when no fallback URLs are setup
|
|
101
111
|
if (this.urlsOpts.length === 1) {
|
|
102
112
|
return this.requestWithBody(this.urlsOpts[0], opts, getBody);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../../../src/utils/client/httpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAU,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"httpClient.js","sourceRoot":"","sources":["../../../src/utils/client/httpClient.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.16.0-dev.
|
|
14
|
+
"version": "1.16.0-dev.efb684a918",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -69,10 +69,10 @@
|
|
|
69
69
|
"dependencies": {
|
|
70
70
|
"@chainsafe/persistent-merkle-tree": "^0.6.1",
|
|
71
71
|
"@chainsafe/ssz": "^0.14.0",
|
|
72
|
-
"@lodestar/config": "1.16.0-dev.
|
|
73
|
-
"@lodestar/params": "1.16.0-dev.
|
|
74
|
-
"@lodestar/types": "1.16.0-dev.
|
|
75
|
-
"@lodestar/utils": "1.16.0-dev.
|
|
72
|
+
"@lodestar/config": "1.16.0-dev.efb684a918",
|
|
73
|
+
"@lodestar/params": "1.16.0-dev.efb684a918",
|
|
74
|
+
"@lodestar/types": "1.16.0-dev.efb684a918",
|
|
75
|
+
"@lodestar/utils": "1.16.0-dev.efb684a918",
|
|
76
76
|
"eventsource": "^2.0.2",
|
|
77
77
|
"qs": "^6.11.1"
|
|
78
78
|
},
|
|
@@ -89,5 +89,5 @@
|
|
|
89
89
|
"api",
|
|
90
90
|
"blockchain"
|
|
91
91
|
],
|
|
92
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "04cb9a0b88b13f602f4bae9efa4a5dee736372c8"
|
|
93
93
|
}
|