@lodestar/prover 1.11.0-dev.bbadfed24a → 1.11.0-dev.cac8bfad70
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/README.md +1 -1
- package/lib/cli/applyPreset.js +2 -4
- package/lib/cli/applyPreset.js.map +1 -1
- package/lib/cli/cmds/start/options.js +3 -4
- package/lib/cli/cmds/start/options.js.map +1 -1
- package/lib/interfaces.d.ts +4 -1
- package/lib/proof_provider/proof_provider.js +4 -7
- package/lib/proof_provider/proof_provider.js.map +1 -1
- package/lib/types.d.ts +5 -5
- package/lib/utils/assertion.d.ts +4 -0
- package/lib/utils/assertion.js +17 -4
- package/lib/utils/assertion.js.map +1 -1
- package/lib/utils/conversion.js +1 -2
- package/lib/utils/conversion.js.map +1 -1
- package/lib/utils/evm.js +6 -9
- package/lib/utils/evm.js.map +1 -1
- package/lib/utils/gitData/index.js +4 -6
- package/lib/utils/gitData/index.js.map +1 -1
- package/lib/utils/process.js +1 -1
- package/lib/utils/process.js.map +1 -1
- package/lib/utils/verification.js +2 -2
- package/lib/utils/verification.js.map +1 -1
- package/lib/verified_requests/eth_call.js +1 -1
- package/lib/verified_requests/eth_call.js.map +1 -1
- package/lib/verified_requests/eth_estimateGas.js +1 -1
- package/lib/verified_requests/eth_estimateGas.js.map +1 -1
- package/lib/web3_provider.d.ts +9 -0
- package/lib/web3_provider.js +24 -11
- package/lib/web3_provider.js.map +1 -1
- package/lib/web3_proxy.js +2 -3
- package/lib/web3_proxy.js.map +1 -1
- package/package.json +12 -12
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
[](https://discord.gg/aMxzVcr)
|
|
4
4
|
[](https://github.com/ethereum/beacon-APIs/releases/tag/v2.1.0)
|
|
5
|
-
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
> This package is part of [ChainSafe's Lodestar](https://lodestar.chainsafe.io) project
|
package/lib/cli/applyPreset.js
CHANGED
|
@@ -12,7 +12,6 @@
|
|
|
12
12
|
//
|
|
13
13
|
// Running this file allows us to keep a static export strategy while NOT requiring users to
|
|
14
14
|
// set LODESTAR_PRESET manually every time.
|
|
15
|
-
var _a;
|
|
16
15
|
// IMPORTANT: only import Lodestar code here which does not import any other Lodestar libraries
|
|
17
16
|
import { setActivePreset, presetFromJson, PresetName } from "@lodestar/params/setPreset";
|
|
18
17
|
import { readFile } from "../utils/file.js";
|
|
@@ -42,7 +41,7 @@ else if (network) {
|
|
|
42
41
|
if (presetFile) {
|
|
43
42
|
// Override the active preset with custom values from file
|
|
44
43
|
// Do not modify the preset to use as a base by passing null
|
|
45
|
-
setActivePreset(null, presetFromJson(
|
|
44
|
+
setActivePreset(null, presetFromJson(readFile(presetFile) ?? {}));
|
|
46
45
|
}
|
|
47
46
|
/**
|
|
48
47
|
* Valid syntax
|
|
@@ -52,11 +51,10 @@ if (presetFile) {
|
|
|
52
51
|
function valueOfArg(argName) {
|
|
53
52
|
// Syntax `--preset minimal`
|
|
54
53
|
// process.argv = ["--preset", "minimal"];
|
|
55
|
-
var _a;
|
|
56
54
|
{
|
|
57
55
|
const index = process.argv.indexOf(`--${argName}`);
|
|
58
56
|
if (index > -1) {
|
|
59
|
-
return
|
|
57
|
+
return process.argv[index + 1] ?? "";
|
|
60
58
|
}
|
|
61
59
|
}
|
|
62
60
|
// Syntax `--preset=minimal`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"applyPreset.js","sourceRoot":"","sources":["../../src/cli/applyPreset.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,EAAE;AACF,eAAe;AACf,EAAE;AACF,yGAAyG;AACzG,sDAAsD;AACtD,EAAE;AACF,qGAAqG;AACrG,+DAA+D;AAC/D,kEAAkE;AAClE,kEAAkE;AAClE,EAAE;AACF,4FAA4F;AAC5F,2CAA2C
|
|
1
|
+
{"version":3,"file":"applyPreset.js","sourceRoot":"","sources":["../../src/cli/applyPreset.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,EAAE;AACF,eAAe;AACf,EAAE;AACF,yGAAyG;AACzG,sDAAsD;AACtD,EAAE;AACF,qGAAqG;AACrG,+DAA+D;AAC/D,kEAAkE;AAClE,kEAAkE;AAClE,EAAE;AACF,4FAA4F;AAC5F,2CAA2C;AAE3C,+FAA+F;AAC/F,OAAO,EAAC,eAAe,EAAE,cAAc,EAAE,UAAU,EAAC,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE1C,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;AACtC,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;AACpC,MAAM,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AAE5C,+BAA+B;AAC/B,IAAI,MAAM,EAAE;IACV,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;CACtC;AAED,8FAA8F;KACzF,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE;IACpC,QAAQ;CACT;AAED,8BAA8B;KACzB,IAAI,OAAO,EAAE;IAChB,IAAI,OAAO,KAAK,KAAK,EAAE;QACrB,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,SAAS,CAAC;QACxC,8DAA8D;QAC9D,gEAAgE;QAChE,eAAe,CAAC,UAAU,CAAC,OAAO,EAAE,EAAC,uBAAuB,EAAE,IAAI,EAAC,CAAC,CAAC;KACtE;SAAM,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,QAAQ,EAAE;QACvD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,QAAQ,CAAC;KACxC;CACF;AAED,IAAI,UAAU,EAAE;IACd,0DAA0D;IAC1D,4DAA4D;IAC5D,eAAe,CAAC,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;CACnE;AAED;;;;GAIG;AACH,SAAS,UAAU,CAAC,OAAe;IACjC,4BAA4B;IAC5B,0CAA0C;IAE1C;QACE,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;QACnD,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;YACd,OAAO,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;SACtC;KACF;IAED,4BAA4B;IAC5B;QACE,MAAM,MAAM,GAAG,KAAK,OAAO,GAAG,CAAC;QAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAChE,IAAI,IAAI,EAAE;YACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAClC;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -48,7 +48,6 @@ export const startOptions = {
|
|
|
48
48
|
},
|
|
49
49
|
};
|
|
50
50
|
export function parseStartArgs(args) {
|
|
51
|
-
var _a, _b, _c;
|
|
52
51
|
if (!args.beaconUrls && !args.beaconBootnodes) {
|
|
53
52
|
throw new Error("Either --beaconUrls or --beaconBootnodes must be provided");
|
|
54
53
|
}
|
|
@@ -57,11 +56,11 @@ export function parseStartArgs(args) {
|
|
|
57
56
|
port: args.port,
|
|
58
57
|
executionRpcUrl: args.executionRpcUrl,
|
|
59
58
|
transport: args.beaconUrls ? LCTransport.Rest : LCTransport.P2P,
|
|
60
|
-
urls:
|
|
61
|
-
bootnodes:
|
|
59
|
+
urls: args.beaconUrls ?? [],
|
|
60
|
+
bootnodes: args.beaconBootnodes ?? [],
|
|
62
61
|
wsCheckpoint: args.wsCheckpoint,
|
|
63
62
|
unverifiedWhitelist: args.unverifiedWhitelist,
|
|
64
|
-
requestTimeout:
|
|
63
|
+
requestTimeout: args.requestTimeout ?? DEFAULT_PROXY_REQUEST_TIMEOUT,
|
|
65
64
|
};
|
|
66
65
|
}
|
|
67
66
|
//# sourceMappingURL=options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../src/cli/cmds/start/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,6BAA6B,EAAC,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAoB/D,MAAM,CAAC,MAAM,YAAY,GAAiC;IACxD,IAAI,EAAE;QACJ,WAAW,EAAE,iCAAiC;QAC9C,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,IAAI;KACd;IAED,eAAe,EAAE;QACf,WAAW,EAAE,iCAAiC;QAC9C,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE,WAAW;KACnB;IAED,mBAAmB,EAAE;QACnB,WAAW,EAAE,mFAAmF,oBAAoB,CAAC,IAAI,CACvH,GAAG,CACJ,sBAAsB;QACvB,IAAI,EAAE,OAAO;QACb,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,WAAW;KACnB;IAED,cAAc,EAAE;QACd,WAAW,EAAE,8DAA8D;QAC3E,OAAO,EAAE,6BAA6B;QACtC,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,WAAW;KACnB;IAED,UAAU,EAAE;QACV,WAAW,EAAE,2CAA2C;QACxD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,CAAC,iBAAiB,CAAC;QAC9B,KAAK,EAAE,QAAQ;KAChB;IAED,eAAe,EAAE;QACf,WAAW,EAAE,0CAA0C;QACvD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,CAAC,YAAY,CAAC;QACzB,KAAK,EAAE,QAAQ;KAChB;IAED,YAAY,EAAE;QACZ,WAAW,EACT,2KAA2K;QAC7K,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,QAAQ;KAChB;CACF,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,IAAe
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../../src/cli/cmds/start/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,6BAA6B,EAAC,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAoB/D,MAAM,CAAC,MAAM,YAAY,GAAiC;IACxD,IAAI,EAAE;QACJ,WAAW,EAAE,iCAAiC;QAC9C,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,IAAI;KACd;IAED,eAAe,EAAE;QACf,WAAW,EAAE,iCAAiC;QAC9C,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE,WAAW;KACnB;IAED,mBAAmB,EAAE;QACnB,WAAW,EAAE,mFAAmF,oBAAoB,CAAC,IAAI,CACvH,GAAG,CACJ,sBAAsB;QACvB,IAAI,EAAE,OAAO;QACb,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,WAAW;KACnB;IAED,cAAc,EAAE;QACd,WAAW,EAAE,8DAA8D;QAC3E,OAAO,EAAE,6BAA6B;QACtC,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,WAAW;KACnB;IAED,UAAU,EAAE;QACV,WAAW,EAAE,2CAA2C;QACxD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,CAAC,iBAAiB,CAAC;QAC9B,KAAK,EAAE,QAAQ;KAChB;IAED,eAAe,EAAE;QACf,WAAW,EAAE,0CAA0C;QACvD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,CAAC,YAAY,CAAC;QACzB,KAAK,EAAE,QAAQ;KAChB;IAED,YAAY,EAAE;QACZ,WAAW,EACT,2KAA2K;QAC7K,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,QAAQ;KAChB;CACF,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,IAAe;IAC5C,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;QAC7C,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;KAC9E;IAED,iFAAiF;IACjF,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,eAAe,EAAE,IAAI,CAAC,eAAe;QACrC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG;QAC/D,IAAI,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE;QAC3B,SAAS,EAAE,IAAI,CAAC,eAAe,IAAI,EAAE;QACrC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,6BAA6B;KACrE,CAAC;AACJ,CAAC"}
|
package/lib/interfaces.d.ts
CHANGED
|
@@ -27,6 +27,9 @@ export type ELRequestHandlerAny = ELRequestHandler<any, any>;
|
|
|
27
27
|
export interface EIP1193Provider {
|
|
28
28
|
request: (payload: JsonRpcRequestOrBatch) => Promise<JsonRpcResponseOrBatch>;
|
|
29
29
|
}
|
|
30
|
+
export interface Web3jsProvider {
|
|
31
|
+
request: (payload: JsonRpcRequest) => Promise<JsonRpcResponse>;
|
|
32
|
+
}
|
|
30
33
|
export interface RequestProvider {
|
|
31
34
|
request(payload: JsonRpcRequestOrBatch, callback: (err: Error | undefined, response: JsonRpcResponseOrBatch) => void): void;
|
|
32
35
|
}
|
|
@@ -39,7 +42,7 @@ export interface EthersProvider {
|
|
|
39
42
|
export interface SendAsyncProvider {
|
|
40
43
|
sendAsync(payload: JsonRpcRequestOrBatch): Promise<JsonRpcResponseOrBatch>;
|
|
41
44
|
}
|
|
42
|
-
export type Web3Provider = SendProvider | EthersProvider | SendAsyncProvider | RequestProvider | EIP1193Provider;
|
|
45
|
+
export type Web3Provider = SendProvider | EthersProvider | SendAsyncProvider | RequestProvider | EIP1193Provider | Web3jsProvider;
|
|
43
46
|
export type ELVerifiedRequestHandlerOpts<Params = unknown[]> = {
|
|
44
47
|
payload: JsonRpcRequest<Params>;
|
|
45
48
|
rpc: ELRpc;
|
|
@@ -64,17 +64,15 @@ export class ProofProvider {
|
|
|
64
64
|
assertLightClient(this.lightClient);
|
|
65
65
|
// Wait for the lightclient to start
|
|
66
66
|
await new Promise((resolve) => {
|
|
67
|
-
var _a, _b;
|
|
68
67
|
const lightClientStarted = (status) => {
|
|
69
|
-
var _a;
|
|
70
68
|
if (status === RunStatusCode.started) {
|
|
71
|
-
|
|
69
|
+
this.lightClient?.emitter.off(LightclientEvent.statusChange, lightClientStarted);
|
|
72
70
|
resolve();
|
|
73
71
|
}
|
|
74
72
|
};
|
|
75
|
-
|
|
73
|
+
this.lightClient?.emitter.on(LightclientEvent.statusChange, lightClientStarted);
|
|
76
74
|
this.logger.info("Initiating lightclient");
|
|
77
|
-
|
|
75
|
+
this.lightClient?.start();
|
|
78
76
|
});
|
|
79
77
|
this.logger.info("Lightclient synced", this.getStatus());
|
|
80
78
|
this.registerEvents();
|
|
@@ -153,8 +151,7 @@ export class ProofProvider {
|
|
|
153
151
|
registerEvents() {
|
|
154
152
|
assertLightClient(this.lightClient);
|
|
155
153
|
this.opts.signal.addEventListener("abort", () => {
|
|
156
|
-
|
|
157
|
-
(_a = this.lightClient) === null || _a === void 0 ? void 0 : _a.stop();
|
|
154
|
+
this.lightClient?.stop();
|
|
158
155
|
});
|
|
159
156
|
this.lightClient.emitter.on(LightclientEvent.lightClientFinalityHeader, async (data) => {
|
|
160
157
|
await this.processLCHeader(data, true).catch((e) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proof_provider.js","sourceRoot":"","sources":["../../src/proof_provider/proof_provider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"proof_provider.js","sourceRoot":"","sources":["../../src/proof_provider/proof_provider.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
export type JsonRpcId = number | string;
|
|
3
|
-
export type JsonRpcVersion = string
|
|
3
|
+
export type JsonRpcVersion = string & ("2.0" | "1.0");
|
|
4
4
|
export interface JsonRpcRequestPayload<T = unknown[]> {
|
|
5
5
|
readonly jsonrpc: JsonRpcVersion;
|
|
6
6
|
readonly id: JsonRpcId;
|
|
@@ -18,8 +18,8 @@ export type JsonRpcRequest<T = unknown[]> = JsonRpcRequestPayload<T> | JsonRpcNo
|
|
|
18
18
|
export type JsonRpcBatchRequest<T = unknown[]> = JsonRpcRequest<T>[];
|
|
19
19
|
export type JsonRpcRequestOrBatch<T = unknown[]> = JsonRpcRequest<T> | JsonRpcBatchRequest<T>;
|
|
20
20
|
export interface JsonRpcResponseWithResultPayload<T> {
|
|
21
|
-
readonly id
|
|
22
|
-
jsonrpc:
|
|
21
|
+
readonly id?: JsonRpcId;
|
|
22
|
+
jsonrpc: JsonRpcVersion;
|
|
23
23
|
result: T;
|
|
24
24
|
error?: never;
|
|
25
25
|
}
|
|
@@ -29,8 +29,8 @@ export interface JsonRpcErrorPayload<T> {
|
|
|
29
29
|
readonly message: string;
|
|
30
30
|
}
|
|
31
31
|
export interface JsonRpcResponseWithErrorPayload<T> {
|
|
32
|
-
readonly id
|
|
33
|
-
jsonrpc:
|
|
32
|
+
readonly id?: JsonRpcId;
|
|
33
|
+
jsonrpc: JsonRpcVersion;
|
|
34
34
|
result?: never;
|
|
35
35
|
error: JsonRpcErrorPayload<T>;
|
|
36
36
|
}
|
package/lib/utils/assertion.d.ts
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { Lightclient } from "@lodestar/light-client";
|
|
2
2
|
import { EIP1193Provider, EthersProvider, RequestProvider, SendAsyncProvider, SendProvider, Web3Provider } from "../interfaces.js";
|
|
3
3
|
export declare function assertLightClient(client?: Lightclient): asserts client is Lightclient;
|
|
4
|
+
/**
|
|
5
|
+
* Checks if the provider is a web3.js version 4x.
|
|
6
|
+
*/
|
|
7
|
+
export declare function isWeb3jsProvider(provider: Web3Provider): provider is EIP1193Provider;
|
|
4
8
|
export declare function isSendProvider(provider: Web3Provider): provider is SendProvider;
|
|
5
9
|
export declare function isEthersProvider(provider: Web3Provider): provider is EthersProvider;
|
|
6
10
|
export declare function isRequestProvider(provider: Web3Provider): provider is RequestProvider;
|
package/lib/utils/assertion.js
CHANGED
|
@@ -3,20 +3,32 @@ export function assertLightClient(client) {
|
|
|
3
3
|
throw new Error("Light client is not initialized yet.");
|
|
4
4
|
}
|
|
5
5
|
}
|
|
6
|
+
/**
|
|
7
|
+
* Checks if the provider is a web3.js version 4x.
|
|
8
|
+
*/
|
|
9
|
+
export function isWeb3jsProvider(provider) {
|
|
10
|
+
return ("isWeb3Provider" in provider.constructor &&
|
|
11
|
+
provider.constructor.isWeb3Provider(provider));
|
|
12
|
+
}
|
|
6
13
|
export function isSendProvider(provider) {
|
|
7
|
-
return (
|
|
14
|
+
return (!isWeb3jsProvider(provider) &&
|
|
15
|
+
"send" in provider &&
|
|
8
16
|
typeof provider.send === "function" &&
|
|
9
17
|
provider.send.length > 1 &&
|
|
10
18
|
provider.send.constructor.name !== "AsyncFunction");
|
|
11
19
|
}
|
|
12
20
|
export function isEthersProvider(provider) {
|
|
13
|
-
return (
|
|
21
|
+
return (!isWeb3jsProvider(provider) &&
|
|
22
|
+
"send" in provider &&
|
|
14
23
|
typeof provider.send === "function" &&
|
|
15
24
|
provider.send.length > 1 &&
|
|
16
25
|
provider.send.constructor.name === "AsyncFunction");
|
|
17
26
|
}
|
|
18
27
|
export function isRequestProvider(provider) {
|
|
19
|
-
return
|
|
28
|
+
return (!isWeb3jsProvider(provider) &&
|
|
29
|
+
"request" in provider &&
|
|
30
|
+
typeof provider.request === "function" &&
|
|
31
|
+
provider.request.length > 1);
|
|
20
32
|
}
|
|
21
33
|
export function isSendAsyncProvider(provider) {
|
|
22
34
|
return ("sendAsync" in provider &&
|
|
@@ -24,7 +36,8 @@ export function isSendAsyncProvider(provider) {
|
|
|
24
36
|
provider.sendAsync.constructor.name === "AsyncFunction");
|
|
25
37
|
}
|
|
26
38
|
export function isEIP1193Provider(provider) {
|
|
27
|
-
return (
|
|
39
|
+
return (!isWeb3jsProvider(provider) &&
|
|
40
|
+
"request" in provider &&
|
|
28
41
|
typeof provider.request === "function" &&
|
|
29
42
|
provider.request.constructor.name === "AsyncFunction");
|
|
30
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertion.js","sourceRoot":"","sources":["../../src/utils/assertion.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,iBAAiB,CAAC,MAAoB;IACpD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAsB;IACnD,OAAO,CACL,MAAM,IAAI,QAAQ;QAClB,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU;QACnC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CACnD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAsB;IACrD,OAAO,CACL,MAAM,IAAI,QAAQ;QAClB,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU;QACnC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CACnD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAsB;IACtD,OAAO,SAAS,IAAI,QAAQ,
|
|
1
|
+
{"version":3,"file":"assertion.js","sourceRoot":"","sources":["../../src/utils/assertion.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,iBAAiB,CAAC,MAAoB;IACpD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;KACzD;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAsB;IACrD,OAAO,CACL,gBAAgB,IAAI,QAAQ,CAAC,WAAW;QACvC,QAAQ,CAAC,WAAqE,CAAC,cAAc,CAAC,QAAQ,CAAC,CACzG,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAsB;IACnD,OAAO,CACL,CAAC,gBAAgB,CAAC,QAAQ,CAAC;QAC3B,MAAM,IAAI,QAAQ;QAClB,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU;QACnC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CACnD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAsB;IACrD,OAAO,CACL,CAAC,gBAAgB,CAAC,QAAQ,CAAC;QAC3B,MAAM,IAAI,QAAQ;QAClB,OAAO,QAAQ,CAAC,IAAI,KAAK,UAAU;QACnC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;QACxB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CACnD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAsB;IACtD,OAAO,CACL,CAAC,gBAAgB,CAAC,QAAQ,CAAC;QAC3B,SAAS,IAAI,QAAQ;QACrB,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU;QACtC,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAC5B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAsB;IACxD,OAAO,CACL,WAAW,IAAI,QAAQ;QACvB,OAAO,QAAQ,CAAC,SAAS,KAAK,UAAU;QACxC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CACxD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,QAAsB;IACtD,OAAO,CACL,CAAC,gBAAgB,CAAC,QAAQ,CAAC;QAC3B,SAAS,IAAI,QAAQ;QACrB,OAAO,QAAQ,CAAC,OAAO,KAAK,UAAU;QACtC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CACtD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,QAAQ,CAAc,KAAQ;IAC5C,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,KAAK,CAAC;AAClE,CAAC"}
|
package/lib/utils/conversion.js
CHANGED
|
@@ -25,7 +25,6 @@ export function padLeft(v, length) {
|
|
|
25
25
|
return Uint8Array.from(buf);
|
|
26
26
|
}
|
|
27
27
|
export function headerDataFromELBlock(blockInfo) {
|
|
28
|
-
var _a;
|
|
29
28
|
return {
|
|
30
29
|
parentHash: blockInfo.parentHash,
|
|
31
30
|
uncleHash: blockInfo.sha3Uncles,
|
|
@@ -43,7 +42,7 @@ export function headerDataFromELBlock(blockInfo) {
|
|
|
43
42
|
mixHash: blockInfo.mixHash,
|
|
44
43
|
nonce: blockInfo.nonce,
|
|
45
44
|
baseFeePerGas: blockInfo.baseFeePerGas ? BigInt(blockInfo.baseFeePerGas) : undefined,
|
|
46
|
-
withdrawalsRoot:
|
|
45
|
+
withdrawalsRoot: blockInfo.withdrawalsRoot ?? undefined,
|
|
47
46
|
};
|
|
48
47
|
}
|
|
49
48
|
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversion.js","sourceRoot":"","sources":["../../src/utils/conversion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAExC,MAAM,UAAU,WAAW,CAAC,GAAoB;IAC9C,OAAO,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,OAAO,KAAK,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,MAA2B;IACrD,OAAO,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,OAAO,CAAgC,CAAI,EAAE,MAAc;IACzE,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;IAE5C,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAAE,OAAO,GAAQ,CAAC;IAExC,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAM,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,SAAkB
|
|
1
|
+
{"version":3,"file":"conversion.js","sourceRoot":"","sources":["../../src/utils/conversion.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/evm.js
CHANGED
|
@@ -23,11 +23,10 @@ export async function createVM({ proofProvider }) {
|
|
|
23
23
|
return vm;
|
|
24
24
|
}
|
|
25
25
|
export async function getVMWithState({ rpc, executionPayload, tx, vm, logger, }) {
|
|
26
|
-
var _a;
|
|
27
26
|
const { stateRoot, blockHash, gasLimit } = executionPayload;
|
|
28
27
|
const blockHashHex = bufferToHex(blockHash);
|
|
29
28
|
// If tx does not have a from address then it must be initiated via zero address
|
|
30
|
-
const from =
|
|
29
|
+
const from = tx.from ?? ZERO_ADDRESS;
|
|
31
30
|
const to = tx.to;
|
|
32
31
|
// Create Access List for the contract call
|
|
33
32
|
const accessListTx = cleanObject({
|
|
@@ -114,7 +113,6 @@ export async function updateVMWithState({ vm, state }) {
|
|
|
114
113
|
return vm;
|
|
115
114
|
}
|
|
116
115
|
export async function executeVMCall({ rpc, tx, vm, executionPayload, network, }) {
|
|
117
|
-
var _a;
|
|
118
116
|
const { from, to, gas, gasPrice, maxPriorityFeePerGas, value, data } = tx;
|
|
119
117
|
const { result: block } = await rpc.request("eth_getBlockByHash", [bufferToHex(executionPayload.blockHash), true], {
|
|
120
118
|
raiseError: true,
|
|
@@ -125,9 +123,9 @@ export async function executeVMCall({ rpc, tx, vm, executionPayload, network, })
|
|
|
125
123
|
const { execResult } = await vm.evm.runCall({
|
|
126
124
|
caller: from ? Address.fromString(from) : undefined,
|
|
127
125
|
to: to ? Address.fromString(to) : undefined,
|
|
128
|
-
gasLimit: hexToBigInt(gas
|
|
129
|
-
gasPrice: hexToBigInt(
|
|
130
|
-
value: hexToBigInt(value
|
|
126
|
+
gasLimit: hexToBigInt(gas ?? block.gasLimit),
|
|
127
|
+
gasPrice: hexToBigInt(gasPrice ?? maxPriorityFeePerGas ?? "0x0"),
|
|
128
|
+
value: hexToBigInt(value ?? "0x0"),
|
|
131
129
|
data: data ? hexToBuffer(data) : undefined,
|
|
132
130
|
block: {
|
|
133
131
|
header: getVMBlockHeaderFromELBlock(block, executionPayload, network),
|
|
@@ -139,7 +137,6 @@ export async function executeVMCall({ rpc, tx, vm, executionPayload, network, })
|
|
|
139
137
|
return execResult;
|
|
140
138
|
}
|
|
141
139
|
export async function executeVMTx({ rpc, tx, vm, executionPayload, network, }) {
|
|
142
|
-
var _a, _b;
|
|
143
140
|
const { result: block } = await rpc.request("eth_getBlockByHash", [bufferToHex(executionPayload.blockHash), true], {
|
|
144
141
|
raiseError: true,
|
|
145
142
|
});
|
|
@@ -155,12 +152,12 @@ export async function executeVMTx({ rpc, tx, vm, executionPayload, network, }) {
|
|
|
155
152
|
to,
|
|
156
153
|
type: txType,
|
|
157
154
|
// If no gas limit is specified use the last block gas limit as an upper bound.
|
|
158
|
-
gasLimit: hexToBigInt(
|
|
155
|
+
gasLimit: hexToBigInt(tx.gas ?? block.gasLimit),
|
|
159
156
|
};
|
|
160
157
|
if (txType === 2) {
|
|
161
158
|
// Handle EIP-1559 transactions
|
|
162
159
|
// To fix the vm error: Transaction's maxFeePerGas (0) is less than the block's baseFeePerGas
|
|
163
|
-
txData.maxFeePerGas =
|
|
160
|
+
txData.maxFeePerGas = txData.maxFeePerGas ?? block.baseFeePerGas;
|
|
164
161
|
}
|
|
165
162
|
else {
|
|
166
163
|
// Legacy transaction
|
package/lib/utils/evm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../src/utils/evm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAC,OAAO,EAAE,OAAO,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAC,EAAE,EAAc,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAQ,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAIrD,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAC,MAAM,iBAAiB,CAAC;AACrH,OAAO,EAAC,cAAc,EAAE,SAAS,EAAC,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAC,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAG/F,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,EAAC,aAAa,EAAiC;IAC5E,MAAM,MAAM,GAAG,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,WAAqB,CAAC,CAAC;IAC1E,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC;IAErD,2EAA2E;IAC3E,0GAA0G;IACzG,UAAkB,CAAC,QAAQ,GAAG,KAAK,EAAE,OAAe,EAAE,EAAE;QACvD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACjE,OAAO;YACL,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS;SAC9B,CAAC;IACJ,CAAC,CAAC;IACF,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,EAAC,MAAM,EAAE,UAAU,EAAC,CAAC,CAAC;IAEjD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,GAAG,EACH,gBAAgB,EAChB,EAAE,EACF,EAAE,EACF,MAAM,GAOP
|
|
1
|
+
{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../src/utils/evm.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ import { execSync } from "node:child_process";
|
|
|
4
4
|
import { readGitDataFile } from "./gitDataPath.js";
|
|
5
5
|
/** Reads git data from a persisted file or local git data at build time. */
|
|
6
6
|
export function readAndGetGitData() {
|
|
7
|
-
var _a, _b;
|
|
8
7
|
try {
|
|
9
8
|
// Gets git data containing current branch and commit info from persistent file.
|
|
10
9
|
let persistedGitData;
|
|
@@ -20,10 +19,10 @@ export function readAndGetGitData() {
|
|
|
20
19
|
// over `.git-data.json` file, which might be stale here.
|
|
21
20
|
branch: currentGitData.branch && currentGitData.branch.length > 0
|
|
22
21
|
? currentGitData.branch
|
|
23
|
-
:
|
|
22
|
+
: persistedGitData.branch ?? "",
|
|
24
23
|
commit: currentGitData.commit && currentGitData.commit.length > 0
|
|
25
24
|
? currentGitData.commit
|
|
26
|
-
:
|
|
25
|
+
: persistedGitData.commit ?? "",
|
|
27
26
|
};
|
|
28
27
|
}
|
|
29
28
|
catch (e) {
|
|
@@ -35,10 +34,9 @@ export function readAndGetGitData() {
|
|
|
35
34
|
}
|
|
36
35
|
/** Gets git data containing current branch and commit info from CLI. */
|
|
37
36
|
export function getGitData() {
|
|
38
|
-
var _a, _b;
|
|
39
37
|
return {
|
|
40
|
-
branch:
|
|
41
|
-
commit:
|
|
38
|
+
branch: process.env.GIT_BRANCH ?? getBranch(),
|
|
39
|
+
commit: process.env.GIT_COMMIT ?? getCommit(),
|
|
42
40
|
};
|
|
43
41
|
}
|
|
44
42
|
/** Tries to get branch from git CLI. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/gitData/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAE5C,wEAAwE;AACxE,oEAAoE;AACpE,OAAO,EAAC,eAAe,EAAU,MAAM,kBAAkB,CAAC;AAE1D,4EAA4E;AAC5E,MAAM,UAAU,iBAAiB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/gitData/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAE5C,wEAAwE;AACxE,oEAAoE;AACpE,OAAO,EAAC,eAAe,EAAU,MAAM,kBAAkB,CAAC;AAE1D,4EAA4E;AAC5E,MAAM,UAAU,iBAAiB;IAC/B,IAAI;QACF,gFAAgF;QAChF,IAAI,gBAAkC,CAAC;QACvC,IAAI;YACF,gBAAgB,GAAG,eAAe,EAAE,CAAC;SACtC;QAAC,OAAO,CAAC,EAAE;YACV,gBAAgB,GAAG,EAAE,CAAC;SACvB;QAED,MAAM,cAAc,GAAG,UAAU,EAAE,CAAC;QAEpC,OAAO;YACL,4DAA4D;YAC5D,yDAAyD;YACzD,MAAM,EACJ,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;gBACvD,CAAC,CAAC,cAAc,CAAC,MAAM;gBACvB,CAAC,CAAC,gBAAgB,CAAC,MAAM,IAAI,EAAE;YACnC,MAAM,EACJ,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;gBACvD,CAAC,CAAC,cAAc,CAAC,MAAM;gBACvB,CAAC,CAAC,gBAAgB,CAAC,MAAM,IAAI,EAAE;SACpC,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;YACL,MAAM,EAAE,EAAE;YACV,MAAM,EAAE,EAAE;SACX,CAAC;KACH;AACH,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,UAAU;IACxB,OAAO;QACL,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,SAAS,EAAE;QAC7C,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,SAAS,EAAE;KAC9C,CAAC;AACJ,CAAC;AAED,wCAAwC;AACxC,SAAS,SAAS;IAChB,IAAI;QACF,OAAO,WAAW,CAAC,iCAAiC,CAAC,CAAC;KACvD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAED,iDAAiD;AACjD,SAAS,SAAS;IAChB,IAAI;QACF,OAAO,WAAW,CAAC,6BAA6B,CAAC,CAAC;KACnD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAED,wDAAwD;AACxD,SAAS,WAAW,CAAC,GAAW;IAC9B,OAAO,QAAQ,CAAC,GAAG,EAAE,EAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAC,CAAC;SACxD,QAAQ,EAAE;SACV,IAAI,EAAE,CAAC;AACZ,CAAC"}
|
package/lib/utils/process.js
CHANGED
|
@@ -29,7 +29,7 @@ export function splitRequestsInChunks(payload, unverifiedWhitelist) {
|
|
|
29
29
|
continue;
|
|
30
30
|
}
|
|
31
31
|
// If unverifiedWhitelist is not set that implies all methods are allowed
|
|
32
|
-
if ((isRequest(pay) && isNullish(unverifiedWhitelist)) ||
|
|
32
|
+
if ((isRequest(pay) && isNullish(unverifiedWhitelist)) || unverifiedWhitelist?.includes(pay.method)) {
|
|
33
33
|
nonVerifiable.push(pay);
|
|
34
34
|
continue;
|
|
35
35
|
}
|
package/lib/utils/process.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../src/utils/process.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,cAAc,EAAC,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAC,uBAAuB,EAAC,MAAM,iDAAiD,CAAC;AACxF,OAAO,EAAC,kBAAkB,EAAC,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAC,oBAAoB,EAAC,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAC,WAAW,EAAC,MAAM,qCAAqC,CAAC;AAChE,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAC,qBAAqB,EAAE,cAAc,EAAE,SAAS,EAAC,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAG1C,6FAA6F;AAC7F,MAAM,CAAC,MAAM,wBAAwB,GAAuD;IAC1F,cAAc,EAAE,cAAc;IAC9B,uBAAuB,EAAE,uBAAuB;IAChD,kBAAkB,EAAE,kBAAkB;IACtC,oBAAoB,EAAE,oBAAoB;IAC1C,WAAW,EAAE,WAAW;IACxB,QAAQ,EAAE,QAAQ;IAClB,eAAe,EAAE,eAAe;CACjC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AACvE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,eAAe,EAAE,iBAAiB,EAAE,cAAc,CAAC,CAAC;AAEzF,MAAM,UAAU,qBAAqB,CACnC,OAA8B,EAC9B,mBAA8B;IAM9B,MAAM,UAAU,GAAwB,EAAE,CAAC;IAC3C,MAAM,aAAa,GAAwB,EAAE,CAAC;IAC9C,MAAM,OAAO,GAAwB,EAAE,CAAC;IAExC,KAAK,MAAM,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE;QAC/D,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC5D,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrB,SAAS;SACV;QAED,yEAAyE;QACzE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,mBAAmB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"process.js","sourceRoot":"","sources":["../../src/utils/process.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { getELBlock, getELCode, getELProof } from "./execution.js";
|
|
|
3
3
|
import { isValidAccount, isValidBlock, isValidCodeHash, isValidStorageKeys } from "./validation.js";
|
|
4
4
|
export async function verifyAccount({ address, proofProvider, logger, rpc, block, }) {
|
|
5
5
|
try {
|
|
6
|
-
const executionPayload = await proofProvider.getExecutionPayload(block
|
|
6
|
+
const executionPayload = await proofProvider.getExecutionPayload(block ?? "latest");
|
|
7
7
|
const proof = await getELProof(rpc, [address, [], bufferToHex(executionPayload.blockHash)]);
|
|
8
8
|
const validAccount = await isValidAccount({
|
|
9
9
|
address: address,
|
|
@@ -25,7 +25,7 @@ export async function verifyAccount({ address, proofProvider, logger, rpc, block
|
|
|
25
25
|
}
|
|
26
26
|
export async function verifyCode({ address, proofProvider, logger, rpc, codeHash, block, }) {
|
|
27
27
|
try {
|
|
28
|
-
const executionPayload = await proofProvider.getExecutionPayload(block
|
|
28
|
+
const executionPayload = await proofProvider.getExecutionPayload(block ?? "latest");
|
|
29
29
|
const code = await getELCode(rpc, [address, bufferToHex(executionPayload.blockHash)]);
|
|
30
30
|
if (await isValidCodeHash({ codeHash, codeResponse: code, logger })) {
|
|
31
31
|
return { data: code, valid: true };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verification.js","sourceRoot":"","sources":["../../src/utils/verification.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAE,SAAS,EAAE,UAAU,EAAC,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAC,cAAc,EAAE,YAAY,EAAE,eAAe,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAKlG,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAClC,OAAO,EACP,aAAa,EACb,MAAM,EACN,GAAG,EACH,KAAK,GAON;IACC,IAAI;QACF,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"verification.js","sourceRoot":"","sources":["../../src/utils/verification.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { getResponseForRequest, getErrorResponseForRequestWithFailedVerification
|
|
|
5
5
|
export const eth_call = async ({ rpc, payload, logger, proofProvider, }) => {
|
|
6
6
|
const { params: [tx, block], } = payload;
|
|
7
7
|
// We assume that standard tx validation already been done by the caller (web3, ethers.js, etc.)
|
|
8
|
-
const executionPayload = await proofProvider.getExecutionPayload(block
|
|
8
|
+
const executionPayload = await proofProvider.getExecutionPayload(block ?? "latest");
|
|
9
9
|
try {
|
|
10
10
|
// TODO: Optimize the creation of the evm
|
|
11
11
|
const vm = await createVM({ proofProvider });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth_call.js","sourceRoot":"","sources":["../../src/verified_requests/eth_call.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,qBAAqB,EACrB,gDAAgD,EAChD,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAE9B,gEAAgE;AAChE,MAAM,CAAC,MAAM,QAAQ,GAA+E,KAAK,EAAE,EACzG,GAAG,EACH,OAAO,EACP,MAAM,EACN,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EACJ,MAAM,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,GACpB,GAAG,OAAO,CAAC;IACZ,gGAAgG;IAChG,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"eth_call.js","sourceRoot":"","sources":["../../src/verified_requests/eth_call.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACxE,OAAO,EACL,qBAAqB,EACrB,gDAAgD,EAChD,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAE9B,gEAAgE;AAChE,MAAM,CAAC,MAAM,QAAQ,GAA+E,KAAK,EAAE,EACzG,GAAG,EACH,OAAO,EACP,MAAM,EACN,aAAa,GACd,EAAE,EAAE;IACH,MAAM,EACJ,MAAM,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,GACpB,GAAG,OAAO,CAAC;IACZ,gGAAgG;IAChG,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC;IAEpF,IAAI;QACF,yCAAyC;QACzC,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,EAAC,aAAa,EAAC,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC;YACvC,GAAG;YACH,gBAAgB;YAChB,EAAE;YACF,EAAE;YACF,MAAM;SACP,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC;YACjC,EAAE,EAAE,WAAW;YACf,EAAE;YACF,GAAG;YACH,gBAAgB;YAChB,OAAO,EAAE,aAAa,CAAC,OAAO;SAC/B,CAAC,CAAC;QAEH,OAAO,qBAAqB,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;KACxE;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,CACV,gCAAgC,EAChC,EAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAC,EAChE,GAAY,CACb,CAAC;QACF,OAAO,gDAAgD,CAAC,OAAO,EAAE,4BAA4B,CAAC,UAAU,CAAC,CAAC,CAAC;KAC5G;AACH,CAAC,CAAC"}
|
|
@@ -5,7 +5,7 @@ import { getErrorResponseForRequestWithFailedVerification, getResponseForRequest
|
|
|
5
5
|
export const eth_estimateGas = async ({ rpc, payload, logger, proofProvider }) => {
|
|
6
6
|
const { params: [tx, block], } = payload;
|
|
7
7
|
// We assume that standard tx validation already been done by the caller (web3, ethers.js, etc.)
|
|
8
|
-
const executionPayload = await proofProvider.getExecutionPayload(block
|
|
8
|
+
const executionPayload = await proofProvider.getExecutionPayload(block ?? "latest");
|
|
9
9
|
try {
|
|
10
10
|
// TODO: Optimize the creation of the evm
|
|
11
11
|
const vm = await createVM({ proofProvider });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth_estimateGas.js","sourceRoot":"","sources":["../../src/verified_requests/eth_estimateGas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACtE,OAAO,EACL,gDAAgD,EAChD,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAE9B,gEAAgE;AAChE,MAAM,CAAC,MAAM,eAAe,GAGxB,KAAK,EAAE,EAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAC,EAAE,EAAE;IAClD,MAAM,EACJ,MAAM,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,GACpB,GAAG,OAAO,CAAC;IACZ,gGAAgG;IAChG,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"eth_estimateGas.js","sourceRoot":"","sources":["../../src/verified_requests/eth_estimateGas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAC,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACtE,OAAO,EACL,gDAAgD,EAChD,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,sBAAsB,CAAC;AAE9B,gEAAgE;AAChE,MAAM,CAAC,MAAM,eAAe,GAGxB,KAAK,EAAE,EAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAC,EAAE,EAAE;IAClD,MAAM,EACJ,MAAM,EAAE,CAAC,EAAE,EAAE,KAAK,CAAC,GACpB,GAAG,OAAO,CAAC;IACZ,gGAAgG;IAChG,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC;IAEpF,IAAI;QACF,yCAAyC;QACzC,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,EAAC,aAAa,EAAC,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC;YACvC,GAAG;YACH,gBAAgB;YAChB,EAAE;YACF,EAAE;YACF,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;YAC/B,EAAE,EAAE,WAAW;YACf,EAAE;YACF,GAAG;YACH,gBAAgB;YAChB,OAAO,EAAE,aAAa,CAAC,OAAO;SAC/B,CAAC,CAAC;QAEH,OAAO,qBAAqB,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;KAC1E;IAAC,OAAO,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,CACV,gCAAgC,EAChC,EAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAC,EAChE,GAAY,CACb,CAAC;QACF,OAAO,gDAAgD,CAAC,OAAO,EAAE,4BAA4B,CAAC,iBAAiB,CAAC,CAAC,CAAC;KACnH;AACH,CAAC,CAAC"}
|
package/lib/web3_provider.d.ts
CHANGED
|
@@ -10,5 +10,14 @@ export declare function createVerifiedExecutionProvider<T extends Web3Provider>(
|
|
|
10
10
|
provider: T;
|
|
11
11
|
proofProvider: ProofProvider;
|
|
12
12
|
};
|
|
13
|
+
/**
|
|
14
|
+
*
|
|
15
|
+
*
|
|
16
|
+
* @export
|
|
17
|
+
* @template T
|
|
18
|
+
* @param {T} provider
|
|
19
|
+
* @param {Logger} logger
|
|
20
|
+
* @return {*} {Web3ProviderTypeHandler<T>}
|
|
21
|
+
*/
|
|
13
22
|
export declare function getProviderTypeHandler<T extends Web3Provider>(provider: T, logger: Logger): Web3ProviderTypeHandler<T>;
|
|
14
23
|
//# sourceMappingURL=web3_provider.d.ts.map
|
package/lib/web3_provider.js
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import { getBrowserLogger } from "@lodestar/logger/browser";
|
|
2
2
|
import { LogLevel } from "@lodestar/logger";
|
|
3
3
|
import { ProofProvider } from "./proof_provider/proof_provider.js";
|
|
4
|
-
import { isEIP1193Provider, isEthersProvider, isRequestProvider, isSendAsyncProvider, isSendProvider, } from "./utils/assertion.js";
|
|
4
|
+
import { isEIP1193Provider, isEthersProvider, isRequestProvider, isSendAsyncProvider, isSendProvider, isWeb3jsProvider, } from "./utils/assertion.js";
|
|
5
5
|
import { processAndVerifyRequest } from "./utils/process.js";
|
|
6
6
|
import { isBatchRequest } from "./utils/json_rpc.js";
|
|
7
7
|
import { ELRpc } from "./utils/rpc.js";
|
|
8
8
|
export function createVerifiedExecutionProvider(provider, opts) {
|
|
9
|
-
|
|
10
|
-
const
|
|
11
|
-
const logger = (_b = opts.logger) !== null && _b !== void 0 ? _b : getBrowserLogger({ level: (_c = opts.logLevel) !== null && _c !== void 0 ? _c : LogLevel.info });
|
|
9
|
+
const signal = opts.signal ?? new AbortController().signal;
|
|
10
|
+
const logger = opts.logger ?? getBrowserLogger({ level: opts.logLevel ?? LogLevel.info });
|
|
12
11
|
const proofProvider = ProofProvider.init({
|
|
13
12
|
...opts,
|
|
14
13
|
signal,
|
|
@@ -112,15 +111,33 @@ function handleEthersProvider(provider, proofProvider, logger) {
|
|
|
112
111
|
}
|
|
113
112
|
return { provider: Object.assign(provider, { send: newSend }), rpc };
|
|
114
113
|
}
|
|
114
|
+
/**
|
|
115
|
+
*
|
|
116
|
+
*
|
|
117
|
+
* @export
|
|
118
|
+
* @template T
|
|
119
|
+
* @param {T} provider
|
|
120
|
+
* @param {Logger} logger
|
|
121
|
+
* @return {*} {Web3ProviderTypeHandler<T>}
|
|
122
|
+
*/
|
|
115
123
|
export function getProviderTypeHandler(provider, logger) {
|
|
116
|
-
if (
|
|
117
|
-
logger.debug("Provider is recognized as
|
|
118
|
-
|
|
124
|
+
if (isWeb3jsProvider(provider)) {
|
|
125
|
+
logger.debug("Provider is recognized as 'web3.js' provider.");
|
|
126
|
+
// EIP-1193 provider is fully compatible with web3.js#4x provider interface
|
|
127
|
+
return handleEIP1193Provider;
|
|
119
128
|
}
|
|
120
129
|
if (isEthersProvider(provider)) {
|
|
121
130
|
logger.debug("Provider is recognized as 'ethers' provider.");
|
|
122
131
|
return handleEthersProvider;
|
|
123
132
|
}
|
|
133
|
+
if (isEIP1193Provider(provider)) {
|
|
134
|
+
logger.debug("Provider is recognized as 'EIP1193' provider.");
|
|
135
|
+
return handleEIP1193Provider;
|
|
136
|
+
}
|
|
137
|
+
if (isSendProvider(provider)) {
|
|
138
|
+
logger.debug("Provider is recognized as legacy provider with 'send' method.");
|
|
139
|
+
return handleSendProvider;
|
|
140
|
+
}
|
|
124
141
|
if (isRequestProvider(provider)) {
|
|
125
142
|
logger.debug("Provider is recognized as legacy provider with 'request' method.");
|
|
126
143
|
return handleRequestProvider;
|
|
@@ -129,10 +146,6 @@ export function getProviderTypeHandler(provider, logger) {
|
|
|
129
146
|
logger.debug("Provider is recognized as legacy provider with 'sendAsync' method.");
|
|
130
147
|
return handleSendAsyncProvider;
|
|
131
148
|
}
|
|
132
|
-
if (isEIP1193Provider(provider)) {
|
|
133
|
-
logger.debug("Provider is recognized as 'EIP1193' provider.");
|
|
134
|
-
return handleEIP1193Provider;
|
|
135
|
-
}
|
|
136
149
|
throw new Error("Unsupported provider type");
|
|
137
150
|
}
|
|
138
151
|
//# sourceMappingURL=web3_provider.js.map
|
package/lib/web3_provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web3_provider.js","sourceRoot":"","sources":["../src/web3_provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAU1C,OAAO,EAAC,aAAa,EAAC,MAAM,oCAAoC,CAAC;AAEjE,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,
|
|
1
|
+
{"version":3,"file":"web3_provider.js","sourceRoot":"","sources":["../src/web3_provider.ts"],"names":[],"mappings":"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"}
|
package/lib/web3_proxy.js
CHANGED
|
@@ -43,10 +43,9 @@ function createHttpHandler({ info, signal, }) {
|
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
export function createVerifiedExecutionProxy(opts) {
|
|
46
|
-
var _a, _b, _c;
|
|
47
46
|
const { executionRpcUrl, requestTimeout } = opts;
|
|
48
|
-
const signal =
|
|
49
|
-
const logger =
|
|
47
|
+
const signal = opts.signal ?? new AbortController().signal;
|
|
48
|
+
const logger = opts.logger ?? getNodeLogger({ level: opts.logLevel ?? LogLevel.info, module: "prover" });
|
|
50
49
|
const proofProvider = ProofProvider.init({
|
|
51
50
|
...opts,
|
|
52
51
|
signal,
|
package/lib/web3_proxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web3_proxy.js","sourceRoot":"","sources":["../src/web3_proxy.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,GAAG,MAAM,UAAU,CAAC;AAC3B,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAC,aAAa,EAAC,MAAM,oCAAoC,CAAC;AAEjE,OAAO,EAAC,qBAAqB,EAAE,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAC,mBAAmB,EAAE,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAC,uBAAuB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,KAAK,EAAC,MAAM,gBAAgB,CAAC;AAOrC,SAAS,iBAAiB,CAAC,EACzB,IAAI,EACJ,MAAM,GAIP;IACC,OAAO,SAAS,OAAO,CAAC,OAA8B;QACpD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,UAAU,GAAG,IAAI,EAAE,CAAC;YAC1B,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBAClC,OAAO,MAAM,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;aACtC;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CACtB;gBACE,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,MAAM;gBACN,OAAO,EAAE;oBACP,cAAc,EAAE,kBAAkB;iBACnC;aACF,EACD,CAAC,GAAG,EAAE,EAAE;gBACN,iBAAiB,CAAC,GAAG,CAAC;qBACnB,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;oBACjB,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACpB,CAAC,CAAC;qBACD,KAAK,CAAC,MAAM,CAAC,CAAC;YACnB,CAAC,CACF,CAAC;YACF,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;gBACrB,GAAG,CAAC,OAAO,EAAE,CAAC;gBACd,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;YACnC,GAAG,CAAC,GAAG,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,IAA0B
|
|
1
|
+
{"version":3,"file":"web3_proxy.js","sourceRoot":"","sources":["../src/web3_proxy.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.11.0-dev.
|
|
14
|
+
"version": "1.11.0-dev.cac8bfad70",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -69,13 +69,13 @@
|
|
|
69
69
|
"@ethereumjs/tx": "^4.1.2",
|
|
70
70
|
"@ethereumjs/util": "^8.0.6",
|
|
71
71
|
"@ethereumjs/vm": "^6.4.2",
|
|
72
|
-
"@lodestar/api": "1.11.0-dev.
|
|
73
|
-
"@lodestar/config": "1.11.0-dev.
|
|
74
|
-
"@lodestar/light-client": "1.11.0-dev.
|
|
75
|
-
"@lodestar/logger": "1.11.0-dev.
|
|
76
|
-
"@lodestar/params": "1.11.0-dev.
|
|
77
|
-
"@lodestar/types": "1.11.0-dev.
|
|
78
|
-
"@lodestar/utils": "1.11.0-dev.
|
|
72
|
+
"@lodestar/api": "1.11.0-dev.cac8bfad70",
|
|
73
|
+
"@lodestar/config": "1.11.0-dev.cac8bfad70",
|
|
74
|
+
"@lodestar/light-client": "1.11.0-dev.cac8bfad70",
|
|
75
|
+
"@lodestar/logger": "1.11.0-dev.cac8bfad70",
|
|
76
|
+
"@lodestar/params": "1.11.0-dev.cac8bfad70",
|
|
77
|
+
"@lodestar/types": "1.11.0-dev.cac8bfad70",
|
|
78
|
+
"@lodestar/utils": "1.11.0-dev.cac8bfad70",
|
|
79
79
|
"ethereum-cryptography": "^1.2.0",
|
|
80
80
|
"find-up": "^6.3.0",
|
|
81
81
|
"http-proxy": "^1.18.1",
|
|
@@ -84,12 +84,12 @@
|
|
|
84
84
|
"yargs": "^17.7.1"
|
|
85
85
|
},
|
|
86
86
|
"devDependencies": {
|
|
87
|
-
"@lodestar/test-utils": "1.11.0-dev.
|
|
87
|
+
"@lodestar/test-utils": "1.11.0-dev.cac8bfad70",
|
|
88
88
|
"@types/http-proxy": "^1.17.10",
|
|
89
89
|
"@types/yargs": "^17.0.24",
|
|
90
90
|
"axios": "^1.3.4",
|
|
91
|
-
"ethers": "^6.
|
|
92
|
-
"web3": "^
|
|
91
|
+
"ethers": "^6.7.0",
|
|
92
|
+
"web3": "^4.0.3"
|
|
93
93
|
},
|
|
94
94
|
"keywords": [
|
|
95
95
|
"ethereum",
|
|
@@ -99,5 +99,5 @@
|
|
|
99
99
|
"blockchain",
|
|
100
100
|
"prover"
|
|
101
101
|
],
|
|
102
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "1976522933dad11daae86c08673ac1b557ef5601"
|
|
103
103
|
}
|