@subql/node-ethereum 3.9.1 → 3.10.0

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.
Files changed (32) hide show
  1. package/CHANGELOG.md +6 -1
  2. package/dist/.tsbuildinfo +1 -1
  3. package/dist/ethereum/api.ethereum.js +8 -9
  4. package/dist/ethereum/api.ethereum.js.map +1 -1
  5. package/dist/ethereum/ethers/celo/celo-provider.d.ts +284 -0
  6. package/dist/ethereum/ethers/celo/celo-provider.js +35 -0
  7. package/dist/ethereum/ethers/celo/celo-provider.js.map +1 -0
  8. package/dist/ethereum/ethers/celo/celo-ws-provider.spec.js +16 -10
  9. package/dist/ethereum/ethers/celo/celo-ws-provider.spec.js.map +1 -1
  10. package/dist/ethereum/ethers/op/op-provider.d.ts +374 -0
  11. package/dist/ethereum/ethers/op/op-provider.js +21 -0
  12. package/dist/ethereum/ethers/op/op-provider.js.map +1 -0
  13. package/dist/ethereum/ethers/op/op-provider.spec.js +32 -0
  14. package/dist/ethereum/ethers/op/op-provider.spec.js.map +1 -0
  15. package/dist/ethereum/utils.ethereum.d.ts +1 -1
  16. package/dist/ethereum/utils.ethereum.js.map +1 -1
  17. package/package.json +2 -2
  18. package/dist/ethereum/ethers/celo/celo-json-rpc-batch-provider.d.ts +0 -7
  19. package/dist/ethereum/ethers/celo/celo-json-rpc-batch-provider.js +0 -23
  20. package/dist/ethereum/ethers/celo/celo-json-rpc-batch-provider.js.map +0 -1
  21. package/dist/ethereum/ethers/celo/celo-json-rpc-batch-provider.spec.js +0 -27
  22. package/dist/ethereum/ethers/celo/celo-json-rpc-batch-provider.spec.js.map +0 -1
  23. package/dist/ethereum/ethers/celo/celo-json-rpc-provider.d.ts +0 -7
  24. package/dist/ethereum/ethers/celo/celo-json-rpc-provider.js +0 -23
  25. package/dist/ethereum/ethers/celo/celo-json-rpc-provider.js.map +0 -1
  26. package/dist/ethereum/ethers/celo/celo-json-rpc-provider.spec.d.ts +0 -1
  27. package/dist/ethereum/ethers/celo/celo-json-rpc-provider.spec.js +0 -27
  28. package/dist/ethereum/ethers/celo/celo-json-rpc-provider.spec.js.map +0 -1
  29. package/dist/ethereum/ethers/celo/celo-ws-provider.d.ts +0 -6
  30. package/dist/ethereum/ethers/celo/celo-ws-provider.js +0 -23
  31. package/dist/ethereum/ethers/celo/celo-ws-provider.js.map +0 -1
  32. /package/dist/ethereum/ethers/{celo/celo-json-rpc-batch-provider.spec.d.ts → op/op-provider.spec.d.ts} +0 -0
@@ -0,0 +1,374 @@
1
+ /// <reference types="node" />
2
+ import { WebSocketProvider, BaseProvider, Formatter } from '@ethersproject/providers';
3
+ import { JsonRpcBatchProvider } from '../json-rpc-batch-provider';
4
+ import { JsonRpcProvider } from '../json-rpc-provider';
5
+ type Constructor = new (...args: any[]) => BaseProvider;
6
+ export declare function OPFormatterMixin<B extends Constructor>(Base: B): {
7
+ new (...args: any[]): {
8
+ _networkPromise: Promise<import("@ethersproject/providers").Network>;
9
+ _network: import("@ethersproject/providers").Network;
10
+ _events: import("@ethersproject/providers/lib/base-provider").Event[];
11
+ formatter: Formatter;
12
+ _emitted: {
13
+ [eventName: string]: number | "pending";
14
+ };
15
+ _pollingInterval: number;
16
+ _poller: NodeJS.Timer;
17
+ _bootstrapPoll: NodeJS.Timer;
18
+ _lastBlockNumber: number;
19
+ _maxFilterBlockRange: number;
20
+ _fastBlockNumber: number;
21
+ _fastBlockNumberPromise: Promise<number>;
22
+ _fastQueryDate: number;
23
+ _maxInternalBlockNumber: number;
24
+ _internalBlockNumber: Promise<{
25
+ blockNumber: number;
26
+ reqTime: number;
27
+ respTime: number;
28
+ }>;
29
+ readonly anyNetwork: boolean;
30
+ disableCcipRead: boolean;
31
+ _ready(): Promise<import("@ethersproject/providers").Network>;
32
+ readonly ready: Promise<import("@ethersproject/providers").Network>;
33
+ ccipReadFetch(tx: import("ethers").Transaction, calldata: string, urls: string[]): Promise<string>;
34
+ _getInternalBlockNumber(maxAge: number): Promise<number>;
35
+ poll(): Promise<void>;
36
+ resetEventsBlock(blockNumber: number): void;
37
+ readonly network: import("@ethersproject/providers").Network;
38
+ detectNetwork(): Promise<import("@ethersproject/providers").Network>;
39
+ getNetwork(): Promise<import("@ethersproject/providers").Network>;
40
+ readonly blockNumber: number;
41
+ polling: boolean;
42
+ pollingInterval: number;
43
+ _getFastBlockNumber(): Promise<number>;
44
+ _setFastBlockNumber(blockNumber: number): void;
45
+ waitForTransaction(transactionHash: string, confirmations?: number, timeout?: number): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
46
+ _waitForTransaction(transactionHash: string, confirmations: number, timeout: number, replaceable: {
47
+ data: string;
48
+ from: string;
49
+ nonce: number;
50
+ to: string;
51
+ value: import("ethers").BigNumber;
52
+ startBlock: number;
53
+ }): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
54
+ getBlockNumber(): Promise<number>;
55
+ getGasPrice(): Promise<import("ethers").BigNumber>;
56
+ getBalance(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("ethers").BigNumber>;
57
+ getTransactionCount(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<number>;
58
+ getCode(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
59
+ getStorageAt(addressOrName: string | Promise<string>, position: import("ethers").BigNumberish | Promise<import("ethers").BigNumberish>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
60
+ _wrapTransaction(tx: import("ethers").Transaction, hash?: string, startBlock?: number): import("@ethersproject/abstract-provider").TransactionResponse;
61
+ sendTransaction(signedTransaction: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionResponse>;
62
+ _getTransactionRequest(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>): Promise<import("ethers").Transaction>;
63
+ _getFilter(filter: import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash | Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>): Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>;
64
+ _call(transaction: import("@ethersproject/abstract-provider").TransactionRequest, blockTag: import("@ethersproject/abstract-provider").BlockTag, attempt: number): Promise<string>;
65
+ call(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
66
+ estimateGas(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>): Promise<import("ethers").BigNumber>;
67
+ _getAddress(addressOrName: string | Promise<string>): Promise<string>;
68
+ _getBlock(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>, includeTransactions?: boolean): Promise<import("@ethersproject/abstract-provider").Block | import("@ethersproject/abstract-provider").BlockWithTransactions>;
69
+ getBlock(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").Block>;
70
+ getBlockWithTransactions(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").BlockWithTransactions>;
71
+ getTransaction(transactionHash: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionResponse>;
72
+ getTransactionReceipt(transactionHash: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
73
+ getLogs(filter: import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash | Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>): Promise<import("@ethersproject/abstract-provider").Log[]>;
74
+ getEtherPrice(): Promise<number>;
75
+ _getBlockTag(blockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").BlockTag>;
76
+ getResolver(name: string): Promise<import("@ethersproject/providers").Resolver>;
77
+ _getResolver(name: string, operation?: string): Promise<string>;
78
+ resolveName(name: string | Promise<string>): Promise<string>;
79
+ lookupAddress(address: string | Promise<string>): Promise<string>;
80
+ getAvatar(nameOrAddress: string): Promise<string>;
81
+ perform(method: string, params: any): Promise<any>;
82
+ _startEvent(event: import("@ethersproject/providers/lib/base-provider").Event): void;
83
+ _stopEvent(event: import("@ethersproject/providers/lib/base-provider").Event): void;
84
+ _addEventListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener, once: boolean): any;
85
+ on(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): any;
86
+ once(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): any;
87
+ emit(eventName: import("@ethersproject/abstract-provider").EventType, ...args: any[]): boolean;
88
+ listenerCount(eventName?: import("@ethersproject/abstract-provider").EventType): number;
89
+ listeners(eventName?: import("@ethersproject/abstract-provider").EventType): import("@ethersproject/abstract-provider").Listener[];
90
+ off(eventName: import("@ethersproject/abstract-provider").EventType, listener?: import("@ethersproject/abstract-provider").Listener): any;
91
+ removeAllListeners(eventName?: import("@ethersproject/abstract-provider").EventType): any;
92
+ getFeeData(): Promise<import("@ethersproject/abstract-provider").FeeData>;
93
+ addListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): import("@ethersproject/abstract-provider").Provider;
94
+ removeListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): import("@ethersproject/abstract-provider").Provider;
95
+ readonly _isProvider: boolean;
96
+ };
97
+ } & B;
98
+ export declare const OPWsProvider: {
99
+ new (...args: any[]): {
100
+ _networkPromise: Promise<import("@ethersproject/providers").Network>;
101
+ _network: import("@ethersproject/providers").Network;
102
+ _events: import("@ethersproject/providers/lib/base-provider").Event[];
103
+ formatter: Formatter;
104
+ _emitted: {
105
+ [eventName: string]: number | "pending";
106
+ };
107
+ _pollingInterval: number;
108
+ _poller: NodeJS.Timer;
109
+ _bootstrapPoll: NodeJS.Timer;
110
+ _lastBlockNumber: number;
111
+ _maxFilterBlockRange: number;
112
+ _fastBlockNumber: number;
113
+ _fastBlockNumberPromise: Promise<number>;
114
+ _fastQueryDate: number;
115
+ _maxInternalBlockNumber: number;
116
+ _internalBlockNumber: Promise<{
117
+ blockNumber: number;
118
+ reqTime: number;
119
+ respTime: number;
120
+ }>;
121
+ readonly anyNetwork: boolean;
122
+ disableCcipRead: boolean;
123
+ _ready(): Promise<import("@ethersproject/providers").Network>;
124
+ readonly ready: Promise<import("@ethersproject/providers").Network>;
125
+ ccipReadFetch(tx: import("ethers").Transaction, calldata: string, urls: string[]): Promise<string>;
126
+ _getInternalBlockNumber(maxAge: number): Promise<number>;
127
+ poll(): Promise<void>;
128
+ resetEventsBlock(blockNumber: number): void;
129
+ readonly network: import("@ethersproject/providers").Network;
130
+ detectNetwork(): Promise<import("@ethersproject/providers").Network>;
131
+ getNetwork(): Promise<import("@ethersproject/providers").Network>;
132
+ readonly blockNumber: number;
133
+ polling: boolean;
134
+ pollingInterval: number;
135
+ _getFastBlockNumber(): Promise<number>;
136
+ _setFastBlockNumber(blockNumber: number): void;
137
+ waitForTransaction(transactionHash: string, confirmations?: number, timeout?: number): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
138
+ _waitForTransaction(transactionHash: string, confirmations: number, timeout: number, replaceable: {
139
+ data: string;
140
+ from: string;
141
+ nonce: number;
142
+ to: string;
143
+ value: import("ethers").BigNumber;
144
+ startBlock: number;
145
+ }): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
146
+ getBlockNumber(): Promise<number>;
147
+ getGasPrice(): Promise<import("ethers").BigNumber>;
148
+ getBalance(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("ethers").BigNumber>;
149
+ getTransactionCount(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<number>;
150
+ getCode(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
151
+ getStorageAt(addressOrName: string | Promise<string>, position: import("ethers").BigNumberish | Promise<import("ethers").BigNumberish>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
152
+ _wrapTransaction(tx: import("ethers").Transaction, hash?: string, startBlock?: number): import("@ethersproject/abstract-provider").TransactionResponse;
153
+ sendTransaction(signedTransaction: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionResponse>;
154
+ _getTransactionRequest(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>): Promise<import("ethers").Transaction>;
155
+ _getFilter(filter: import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash | Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>): Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>;
156
+ _call(transaction: import("@ethersproject/abstract-provider").TransactionRequest, blockTag: import("@ethersproject/abstract-provider").BlockTag, attempt: number): Promise<string>;
157
+ call(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
158
+ estimateGas(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>): Promise<import("ethers").BigNumber>;
159
+ _getAddress(addressOrName: string | Promise<string>): Promise<string>;
160
+ _getBlock(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>, includeTransactions?: boolean): Promise<import("@ethersproject/abstract-provider").Block | import("@ethersproject/abstract-provider").BlockWithTransactions>;
161
+ getBlock(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").Block>;
162
+ getBlockWithTransactions(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").BlockWithTransactions>;
163
+ getTransaction(transactionHash: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionResponse>;
164
+ getTransactionReceipt(transactionHash: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
165
+ getLogs(filter: import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash | Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>): Promise<import("@ethersproject/abstract-provider").Log[]>;
166
+ getEtherPrice(): Promise<number>;
167
+ _getBlockTag(blockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").BlockTag>;
168
+ getResolver(name: string): Promise<import("@ethersproject/providers").Resolver>;
169
+ _getResolver(name: string, operation?: string): Promise<string>;
170
+ resolveName(name: string | Promise<string>): Promise<string>;
171
+ lookupAddress(address: string | Promise<string>): Promise<string>;
172
+ getAvatar(nameOrAddress: string): Promise<string>;
173
+ perform(method: string, params: any): Promise<any>;
174
+ _startEvent(event: import("@ethersproject/providers/lib/base-provider").Event): void;
175
+ _stopEvent(event: import("@ethersproject/providers/lib/base-provider").Event): void;
176
+ _addEventListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener, once: boolean): any;
177
+ on(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): any;
178
+ once(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): any;
179
+ emit(eventName: import("@ethersproject/abstract-provider").EventType, ...args: any[]): boolean;
180
+ listenerCount(eventName?: import("@ethersproject/abstract-provider").EventType): number;
181
+ listeners(eventName?: import("@ethersproject/abstract-provider").EventType): import("@ethersproject/abstract-provider").Listener[];
182
+ off(eventName: import("@ethersproject/abstract-provider").EventType, listener?: import("@ethersproject/abstract-provider").Listener): any;
183
+ removeAllListeners(eventName?: import("@ethersproject/abstract-provider").EventType): any;
184
+ getFeeData(): Promise<import("@ethersproject/abstract-provider").FeeData>;
185
+ addListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): import("@ethersproject/abstract-provider").Provider;
186
+ removeListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): import("@ethersproject/abstract-provider").Provider;
187
+ readonly _isProvider: boolean;
188
+ };
189
+ } & typeof WebSocketProvider;
190
+ export declare const OPJsonRpcProvider: {
191
+ new (...args: any[]): {
192
+ _networkPromise: Promise<import("@ethersproject/providers").Network>;
193
+ _network: import("@ethersproject/providers").Network;
194
+ _events: import("@ethersproject/providers/lib/base-provider").Event[];
195
+ formatter: Formatter;
196
+ _emitted: {
197
+ [eventName: string]: number | "pending";
198
+ };
199
+ _pollingInterval: number;
200
+ _poller: NodeJS.Timer;
201
+ _bootstrapPoll: NodeJS.Timer;
202
+ _lastBlockNumber: number;
203
+ _maxFilterBlockRange: number;
204
+ _fastBlockNumber: number;
205
+ _fastBlockNumberPromise: Promise<number>;
206
+ _fastQueryDate: number;
207
+ _maxInternalBlockNumber: number;
208
+ _internalBlockNumber: Promise<{
209
+ blockNumber: number;
210
+ reqTime: number;
211
+ respTime: number;
212
+ }>;
213
+ readonly anyNetwork: boolean;
214
+ disableCcipRead: boolean;
215
+ _ready(): Promise<import("@ethersproject/providers").Network>;
216
+ readonly ready: Promise<import("@ethersproject/providers").Network>;
217
+ ccipReadFetch(tx: import("ethers").Transaction, calldata: string, urls: string[]): Promise<string>;
218
+ _getInternalBlockNumber(maxAge: number): Promise<number>;
219
+ poll(): Promise<void>;
220
+ resetEventsBlock(blockNumber: number): void;
221
+ readonly network: import("@ethersproject/providers").Network;
222
+ detectNetwork(): Promise<import("@ethersproject/providers").Network>;
223
+ getNetwork(): Promise<import("@ethersproject/providers").Network>;
224
+ readonly blockNumber: number;
225
+ polling: boolean;
226
+ pollingInterval: number;
227
+ _getFastBlockNumber(): Promise<number>;
228
+ _setFastBlockNumber(blockNumber: number): void;
229
+ waitForTransaction(transactionHash: string, confirmations?: number, timeout?: number): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
230
+ _waitForTransaction(transactionHash: string, confirmations: number, timeout: number, replaceable: {
231
+ data: string;
232
+ from: string;
233
+ nonce: number;
234
+ to: string;
235
+ value: import("ethers").BigNumber;
236
+ startBlock: number;
237
+ }): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
238
+ getBlockNumber(): Promise<number>;
239
+ getGasPrice(): Promise<import("ethers").BigNumber>;
240
+ getBalance(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("ethers").BigNumber>;
241
+ getTransactionCount(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<number>;
242
+ getCode(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
243
+ getStorageAt(addressOrName: string | Promise<string>, position: import("ethers").BigNumberish | Promise<import("ethers").BigNumberish>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
244
+ _wrapTransaction(tx: import("ethers").Transaction, hash?: string, startBlock?: number): import("@ethersproject/abstract-provider").TransactionResponse;
245
+ sendTransaction(signedTransaction: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionResponse>;
246
+ _getTransactionRequest(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>): Promise<import("ethers").Transaction>;
247
+ _getFilter(filter: import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash | Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>): Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>;
248
+ _call(transaction: import("@ethersproject/abstract-provider").TransactionRequest, blockTag: import("@ethersproject/abstract-provider").BlockTag, attempt: number): Promise<string>;
249
+ call(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
250
+ estimateGas(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>): Promise<import("ethers").BigNumber>;
251
+ _getAddress(addressOrName: string | Promise<string>): Promise<string>;
252
+ _getBlock(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>, includeTransactions?: boolean): Promise<import("@ethersproject/abstract-provider").Block | import("@ethersproject/abstract-provider").BlockWithTransactions>;
253
+ getBlock(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").Block>;
254
+ getBlockWithTransactions(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").BlockWithTransactions>;
255
+ getTransaction(transactionHash: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionResponse>;
256
+ getTransactionReceipt(transactionHash: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
257
+ getLogs(filter: import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash | Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>): Promise<import("@ethersproject/abstract-provider").Log[]>;
258
+ getEtherPrice(): Promise<number>;
259
+ _getBlockTag(blockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").BlockTag>;
260
+ getResolver(name: string): Promise<import("@ethersproject/providers").Resolver>;
261
+ _getResolver(name: string, operation?: string): Promise<string>;
262
+ resolveName(name: string | Promise<string>): Promise<string>;
263
+ lookupAddress(address: string | Promise<string>): Promise<string>;
264
+ getAvatar(nameOrAddress: string): Promise<string>;
265
+ perform(method: string, params: any): Promise<any>;
266
+ _startEvent(event: import("@ethersproject/providers/lib/base-provider").Event): void;
267
+ _stopEvent(event: import("@ethersproject/providers/lib/base-provider").Event): void;
268
+ _addEventListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener, once: boolean): any;
269
+ on(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): any;
270
+ once(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): any;
271
+ emit(eventName: import("@ethersproject/abstract-provider").EventType, ...args: any[]): boolean;
272
+ listenerCount(eventName?: import("@ethersproject/abstract-provider").EventType): number;
273
+ listeners(eventName?: import("@ethersproject/abstract-provider").EventType): import("@ethersproject/abstract-provider").Listener[];
274
+ off(eventName: import("@ethersproject/abstract-provider").EventType, listener?: import("@ethersproject/abstract-provider").Listener): any;
275
+ removeAllListeners(eventName?: import("@ethersproject/abstract-provider").EventType): any;
276
+ getFeeData(): Promise<import("@ethersproject/abstract-provider").FeeData>;
277
+ addListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): import("@ethersproject/abstract-provider").Provider;
278
+ removeListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): import("@ethersproject/abstract-provider").Provider;
279
+ readonly _isProvider: boolean;
280
+ };
281
+ } & typeof JsonRpcProvider;
282
+ export declare const OPJsonRpcBatchProvider: {
283
+ new (...args: any[]): {
284
+ _networkPromise: Promise<import("@ethersproject/providers").Network>;
285
+ _network: import("@ethersproject/providers").Network;
286
+ _events: import("@ethersproject/providers/lib/base-provider").Event[];
287
+ formatter: Formatter;
288
+ _emitted: {
289
+ [eventName: string]: number | "pending";
290
+ };
291
+ _pollingInterval: number;
292
+ _poller: NodeJS.Timer;
293
+ _bootstrapPoll: NodeJS.Timer;
294
+ _lastBlockNumber: number;
295
+ _maxFilterBlockRange: number;
296
+ _fastBlockNumber: number;
297
+ _fastBlockNumberPromise: Promise<number>;
298
+ _fastQueryDate: number;
299
+ _maxInternalBlockNumber: number;
300
+ _internalBlockNumber: Promise<{
301
+ blockNumber: number;
302
+ reqTime: number;
303
+ respTime: number;
304
+ }>;
305
+ readonly anyNetwork: boolean;
306
+ disableCcipRead: boolean;
307
+ _ready(): Promise<import("@ethersproject/providers").Network>;
308
+ readonly ready: Promise<import("@ethersproject/providers").Network>;
309
+ ccipReadFetch(tx: import("ethers").Transaction, calldata: string, urls: string[]): Promise<string>;
310
+ _getInternalBlockNumber(maxAge: number): Promise<number>;
311
+ poll(): Promise<void>;
312
+ resetEventsBlock(blockNumber: number): void;
313
+ readonly network: import("@ethersproject/providers").Network;
314
+ detectNetwork(): Promise<import("@ethersproject/providers").Network>;
315
+ getNetwork(): Promise<import("@ethersproject/providers").Network>;
316
+ readonly blockNumber: number;
317
+ polling: boolean;
318
+ pollingInterval: number;
319
+ _getFastBlockNumber(): Promise<number>;
320
+ _setFastBlockNumber(blockNumber: number): void;
321
+ waitForTransaction(transactionHash: string, confirmations?: number, timeout?: number): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
322
+ _waitForTransaction(transactionHash: string, confirmations: number, timeout: number, replaceable: {
323
+ data: string;
324
+ from: string;
325
+ nonce: number;
326
+ to: string;
327
+ value: import("ethers").BigNumber;
328
+ startBlock: number;
329
+ }): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
330
+ getBlockNumber(): Promise<number>;
331
+ getGasPrice(): Promise<import("ethers").BigNumber>;
332
+ getBalance(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("ethers").BigNumber>;
333
+ getTransactionCount(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<number>;
334
+ getCode(addressOrName: string | Promise<string>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
335
+ getStorageAt(addressOrName: string | Promise<string>, position: import("ethers").BigNumberish | Promise<import("ethers").BigNumberish>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
336
+ _wrapTransaction(tx: import("ethers").Transaction, hash?: string, startBlock?: number): import("@ethersproject/abstract-provider").TransactionResponse;
337
+ sendTransaction(signedTransaction: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionResponse>;
338
+ _getTransactionRequest(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>): Promise<import("ethers").Transaction>;
339
+ _getFilter(filter: import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash | Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>): Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>;
340
+ _call(transaction: import("@ethersproject/abstract-provider").TransactionRequest, blockTag: import("@ethersproject/abstract-provider").BlockTag, attempt: number): Promise<string>;
341
+ call(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>, blockTag?: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<string>;
342
+ estimateGas(transaction: import("@ethersproject/properties").Deferrable<import("@ethersproject/abstract-provider").TransactionRequest>): Promise<import("ethers").BigNumber>;
343
+ _getAddress(addressOrName: string | Promise<string>): Promise<string>;
344
+ _getBlock(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>, includeTransactions?: boolean): Promise<import("@ethersproject/abstract-provider").Block | import("@ethersproject/abstract-provider").BlockWithTransactions>;
345
+ getBlock(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").Block>;
346
+ getBlockWithTransactions(blockHashOrBlockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").BlockWithTransactions>;
347
+ getTransaction(transactionHash: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionResponse>;
348
+ getTransactionReceipt(transactionHash: string | Promise<string>): Promise<import("@ethersproject/abstract-provider").TransactionReceipt>;
349
+ getLogs(filter: import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash | Promise<import("@ethersproject/abstract-provider").Filter | import("@ethersproject/abstract-provider").FilterByBlockHash>): Promise<import("@ethersproject/abstract-provider").Log[]>;
350
+ getEtherPrice(): Promise<number>;
351
+ _getBlockTag(blockTag: import("@ethersproject/abstract-provider").BlockTag | Promise<import("@ethersproject/abstract-provider").BlockTag>): Promise<import("@ethersproject/abstract-provider").BlockTag>;
352
+ getResolver(name: string): Promise<import("@ethersproject/providers").Resolver>;
353
+ _getResolver(name: string, operation?: string): Promise<string>;
354
+ resolveName(name: string | Promise<string>): Promise<string>;
355
+ lookupAddress(address: string | Promise<string>): Promise<string>;
356
+ getAvatar(nameOrAddress: string): Promise<string>;
357
+ perform(method: string, params: any): Promise<any>;
358
+ _startEvent(event: import("@ethersproject/providers/lib/base-provider").Event): void;
359
+ _stopEvent(event: import("@ethersproject/providers/lib/base-provider").Event): void;
360
+ _addEventListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener, once: boolean): any;
361
+ on(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): any;
362
+ once(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): any;
363
+ emit(eventName: import("@ethersproject/abstract-provider").EventType, ...args: any[]): boolean;
364
+ listenerCount(eventName?: import("@ethersproject/abstract-provider").EventType): number;
365
+ listeners(eventName?: import("@ethersproject/abstract-provider").EventType): import("@ethersproject/abstract-provider").Listener[];
366
+ off(eventName: import("@ethersproject/abstract-provider").EventType, listener?: import("@ethersproject/abstract-provider").Listener): any;
367
+ removeAllListeners(eventName?: import("@ethersproject/abstract-provider").EventType): any;
368
+ getFeeData(): Promise<import("@ethersproject/abstract-provider").FeeData>;
369
+ addListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): import("@ethersproject/abstract-provider").Provider;
370
+ removeListener(eventName: import("@ethersproject/abstract-provider").EventType, listener: import("@ethersproject/abstract-provider").Listener): import("@ethersproject/abstract-provider").Provider;
371
+ readonly _isProvider: boolean;
372
+ };
373
+ } & typeof JsonRpcBatchProvider;
374
+ export {};
@@ -0,0 +1,21 @@
1
+ "use strict";
2
+ // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
3
+ // SPDX-License-Identifier: GPL-3.0
4
+ Object.defineProperty(exports, "__esModule", { value: true });
5
+ exports.OPJsonRpcBatchProvider = exports.OPJsonRpcProvider = exports.OPWsProvider = exports.OPFormatterMixin = void 0;
6
+ const providers_1 = require("@ethersproject/providers");
7
+ const json_rpc_batch_provider_1 = require("../json-rpc-batch-provider");
8
+ const json_rpc_provider_1 = require("../json-rpc-provider");
9
+ function OPFormatterMixin(Base) {
10
+ return class OPProvider extends Base {
11
+ constructor(...args) {
12
+ super(...args);
13
+ this.formatter.formats.receipt = Object.assign(Object.assign({}, this.formatter.formats.receipt), { l1Fee: providers_1.Formatter.allowNull(this.formatter.bigNumber.bind(this.formatter)), l1FeeScalar: providers_1.Formatter.allowNull((v) => Number(v)), l1GasPrice: providers_1.Formatter.allowNull(this.formatter.bigNumber.bind(this.formatter)), l1GasUsed: providers_1.Formatter.allowNull(this.formatter.bigNumber.bind(this.formatter)) });
14
+ }
15
+ };
16
+ }
17
+ exports.OPFormatterMixin = OPFormatterMixin;
18
+ exports.OPWsProvider = OPFormatterMixin(providers_1.WebSocketProvider);
19
+ exports.OPJsonRpcProvider = OPFormatterMixin(json_rpc_provider_1.JsonRpcProvider);
20
+ exports.OPJsonRpcBatchProvider = OPFormatterMixin(json_rpc_batch_provider_1.JsonRpcBatchProvider);
21
+ //# sourceMappingURL=op-provider.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"op-provider.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/op/op-provider.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAEnC,wDAIkC;AAClC,wEAAkE;AAClE,4DAAuD;AAIvD,SAAgB,gBAAgB,CAAwB,IAAO;IAC7D,OAAO,MAAM,UAAW,SAAQ,IAAI;QAClC,YAAY,GAAG,IAAW;YACxB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;YAEf,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,mCACzB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,KACjC,KAAK,EAAE,qBAAS,CAAC,SAAS,CACxB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAC9C,EACD,WAAW,EAAE,qBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAClD,UAAU,EAAE,qBAAS,CAAC,SAAS,CAC7B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAC9C,EACD,SAAS,EAAE,qBAAS,CAAC,SAAS,CAC5B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAC9C,GACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AApBD,4CAoBC;AAEY,QAAA,YAAY,GAAG,gBAAgB,CAAC,6BAAiB,CAAC,CAAC;AACnD,QAAA,iBAAiB,GAAG,gBAAgB,CAAC,mCAAe,CAAC,CAAC;AACtD,QAAA,sBAAsB,GAAG,gBAAgB,CAAC,8CAAoB,CAAC,CAAC","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport {\n WebSocketProvider,\n BaseProvider,\n Formatter,\n} from '@ethersproject/providers';\nimport { JsonRpcBatchProvider } from '../json-rpc-batch-provider';\nimport { JsonRpcProvider } from '../json-rpc-provider';\n\n/* This mixin replaces the block formatter on any provider with specific OP changes */\ntype Constructor = new (...args: any[]) => BaseProvider;\nexport function OPFormatterMixin<B extends Constructor>(Base: B) {\n return class OPProvider extends Base {\n constructor(...args: any[]) {\n super(...args);\n\n this.formatter.formats.receipt = {\n ...this.formatter.formats.receipt,\n l1Fee: Formatter.allowNull(\n this.formatter.bigNumber.bind(this.formatter),\n ),\n l1FeeScalar: Formatter.allowNull((v) => Number(v)),\n l1GasPrice: Formatter.allowNull(\n this.formatter.bigNumber.bind(this.formatter),\n ),\n l1GasUsed: Formatter.allowNull(\n this.formatter.bigNumber.bind(this.formatter),\n ),\n };\n }\n };\n}\n\nexport const OPWsProvider = OPFormatterMixin(WebSocketProvider);\nexport const OPJsonRpcProvider = OPFormatterMixin(JsonRpcProvider);\nexport const OPJsonRpcBatchProvider = OPFormatterMixin(JsonRpcBatchProvider);\n"]}
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
3
+ // SPDX-License-Identifier: GPL-3.0
4
+ Object.defineProperty(exports, "__esModule", { value: true });
5
+ const ethers_1 = require("ethers");
6
+ const utils_ethereum_1 = require("../../utils.ethereum");
7
+ const op_provider_1 = require("./op-provider");
8
+ const HTTP_ENDPOINT = 'https://mainnet.optimism.io';
9
+ describe('OPRPCProviders', () => {
10
+ let provider;
11
+ // For some reason defining this in before all fails
12
+ beforeEach(() => {
13
+ provider = new op_provider_1.OPJsonRpcProvider(HTTP_ENDPOINT);
14
+ });
15
+ // This returns a value now, needs further investigation
16
+ it('should have extra fields in transactions', async () => {
17
+ const receipt = (0, utils_ethereum_1.formatReceipt)(await provider.getTransactionReceipt('0x5496af6ad1d619279d82b8f4c94cf3f8da8c02f22481c66a840ae9dd3f5e1a23'), null);
18
+ expect(receipt.l1Fee).toEqual(ethers_1.BigNumber.from('0x1375ad1b756e'));
19
+ expect(receipt.l1FeeScalar).toEqual(0.684);
20
+ expect(receipt.l1GasPrice).toEqual(ethers_1.BigNumber.from('0x02fae225ae'));
21
+ expect(receipt.l1GasUsed).toEqual(ethers_1.BigNumber.from('0x098c'));
22
+ });
23
+ it('should work with a network that isnt OP based', async () => {
24
+ const provider = new op_provider_1.OPJsonRpcProvider('https://eth.llamarpc.com');
25
+ const receipt = (0, utils_ethereum_1.formatReceipt)(await provider.getTransactionReceipt('0x7c20ced906264f81929802ee6b642d003a236c542c5de6298ede5b2a4f7f9bb9'), null);
26
+ expect(receipt.l1Fee).toBeUndefined();
27
+ expect(receipt.l1FeeScalar).toBeUndefined();
28
+ expect(receipt.l1GasPrice).toBeUndefined();
29
+ expect(receipt.l1GasUsed).toBeUndefined();
30
+ }, 10000);
31
+ });
32
+ //# sourceMappingURL=op-provider.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"op-provider.spec.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/op/op-provider.spec.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;AAGnC,mCAAmC;AACnC,yDAAqD;AAErD,+CAAkD;AAElD,MAAM,aAAa,GAAG,6BAA6B,CAAC;AASpD,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,IAAI,QAAyB,CAAC;IAE9B,oDAAoD;IACpD,UAAU,CAAC,GAAG,EAAE;QACd,QAAQ,GAAG,IAAI,+BAAiB,CAAC,aAAa,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,wDAAwD;IACxD,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,OAAO,GAAG,IAAA,8BAAa,EAC3B,MAAM,QAAQ,CAAC,qBAAqB,CAClC,oEAAoE,CACrE,EACD,IAAI,CACL,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAChE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;QACnE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,kBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,QAAQ,GAAG,IAAI,+BAAiB,CAAC,0BAA0B,CAAC,CAAC;QAEnE,MAAM,OAAO,GAAG,IAAA,8BAAa,EAC3B,MAAM,QAAQ,CAAC,qBAAqB,CAClC,oEAAoE,CACrE,EACD,IAAI,CACL,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;QACtC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,aAAa,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE,CAAC;IAC5C,CAAC,EAAE,KAAK,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { EthereumReceipt } from '@subql/types-ethereum';\nimport { BigNumber } from 'ethers';\nimport { formatReceipt } from '../../utils.ethereum';\nimport { JsonRpcProvider } from '../json-rpc-provider';\nimport { OPJsonRpcProvider } from './op-provider';\n\nconst HTTP_ENDPOINT = 'https://mainnet.optimism.io';\n\ntype OPReceiptFields = {\n l1Fee: BigNumber;\n l1FeeScalar: number;\n l1GasPrice: BigNumber;\n l1GasUsed: BigNumber;\n};\n\ndescribe('OPRPCProviders', () => {\n let provider: JsonRpcProvider;\n\n // For some reason defining this in before all fails\n beforeEach(() => {\n provider = new OPJsonRpcProvider(HTTP_ENDPOINT);\n });\n\n // This returns a value now, needs further investigation\n it('should have extra fields in transactions', async () => {\n const receipt = formatReceipt<EthereumReceipt & OPReceiptFields>(\n await provider.getTransactionReceipt(\n '0x5496af6ad1d619279d82b8f4c94cf3f8da8c02f22481c66a840ae9dd3f5e1a23',\n ),\n null,\n );\n\n expect(receipt.l1Fee).toEqual(BigNumber.from('0x1375ad1b756e'));\n expect(receipt.l1FeeScalar).toEqual(0.684);\n expect(receipt.l1GasPrice).toEqual(BigNumber.from('0x02fae225ae'));\n expect(receipt.l1GasUsed).toEqual(BigNumber.from('0x098c'));\n });\n\n it('should work with a network that isnt OP based', async () => {\n const provider = new OPJsonRpcProvider('https://eth.llamarpc.com');\n\n const receipt = formatReceipt<EthereumReceipt & OPReceiptFields>(\n await provider.getTransactionReceipt(\n '0x7c20ced906264f81929802ee6b642d003a236c542c5de6298ede5b2a4f7f9bb9',\n ),\n null,\n );\n\n expect(receipt.l1Fee).toBeUndefined();\n expect(receipt.l1FeeScalar).toBeUndefined();\n expect(receipt.l1GasPrice).toBeUndefined();\n expect(receipt.l1GasUsed).toBeUndefined();\n }, 10000);\n});\n"]}
@@ -3,4 +3,4 @@ export declare function calcInterval(api: ApiWrapper): number;
3
3
  export declare function formatBlock(block: Record<string, any>): EthereumBlock;
4
4
  export declare function formatLog(log: Omit<EthereumLog<EthereumResult> | EthereumLog, 'blockTimestamp' | 'block' | 'transaction'>, block: EthereumBlock): EthereumLog<EthereumResult> | EthereumLog;
5
5
  export declare function formatTransaction(tx: Record<string, any>, block: EthereumBlock): EthereumTransaction;
6
- export declare function formatReceipt(receipt: Record<string, any>, block: EthereumBlock): EthereumReceipt;
6
+ export declare function formatReceipt<R extends EthereumReceipt = EthereumReceipt>(receipt: Record<string, any>, block: EthereumBlock): R;
@@ -1 +1 @@
1
- {"version":3,"file":"utils.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/utils.ethereum.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAEnC,oDAAoD;AACpD,wDAAqD;AACrD,wDAAgD;AAShD,mCAA8B;AAE9B,SAAgB,YAAY,CAAC,GAAe;IAC1C,kDAAkD;IAClD,OAAO,IAAI,CAAC;AACd,CAAC;AAHD,oCAGC;AAED,SAAS,aAAa,CAAC,KAAa;IAClC,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IACD,OAAO,IAAA,oBAAU,EAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,YAAY,CAAC,KAAsB;IAC1C,IAAI,KAAK,KAAK,SAAS,EAAE;QACvB,OAAO,gBAAI,CAAC;KACb;IACD,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,OAAO,gBAAI,CAAC;KACb;IACD,IAAI,KAAK,KAAK,IAAI,EAAE;QAClB,OAAO,gBAAI,CAAC;KACb;IACD,OAAO,qBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,SAAgB,WAAW,CAAC,KAA0B;IACpD,OAAO,gCACF,KAAK,KACR,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,EACrD,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EACjD,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAC/C,MAAM,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAC7C,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EACzC,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EACnD,eAAe,EAAE,YAAY,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,EAC/D,aAAa,EAAE,KAAK,CAAC,aAAa;YAChC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;YAC9C,CAAC,CAAC,SAAS,EACb,YAAY,EAAE,KAAK,CAAC,YAAY;YAC9B,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE;YAC7C,CAAC,CAAC,SAAS,EACb,IAAI,EAAE,EAAE,GACQ,CAAC;AACrB,CAAC;AAlBD,kCAkBC;AACD,SAAgB,SAAS,CACvB,GAGC,EACD,KAAoB;IAEpB,MAAM,YAAY,mCACb,GAAG,KACN,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EACnC,WAAW,EAAE,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,EACrD,gBAAgB,EAAE,YAAY,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,EAC/D,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAC/C,KAAK;QACL,MAAM;YACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAA,aAAI,EAAC,IAAI,EAAE,CAAC,aAAa,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxE,CAAC,GACF,CAAC;IAEF,4EAA4E;IAC5E,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,aAAa,EAAE;QACjD,GAAG,EAAE,GAAG,EAAE;;YACR,MAAM,cAAc,GAAG,MAAA,KAAK,CAAC,YAAY,0CAAE,IAAI,CAC7C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,eAAe,CACxC,CAAC;YAEF,OAAO,cAAc,CAAC;QACxB,CAAC;KACF,CAAC,CAAC;IACH,OAAO,YAAsD,CAAC;AAChE,CAAC;AA9BD,8BA8BC;AAED,SAAgB,iBAAiB,CAC/B,EAAuB,EACvB,KAAoB;IAEpB,OAAO,gCACD,EAAmC,KACvC,IAAI,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,EAC5B,EAAE,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC,EACxB,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,EACpD,cAAc,EAAE,KAAK,CAAC,SAAS,EAC/B,GAAG,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EACpC,QAAQ,EAAE,YAAY,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAC9C,KAAK,EAAE,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EACxC,gBAAgB,EAAE,YAAY,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,EAC9D,KAAK,EAAE,YAAY,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,EACxC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAChC,YAAY,EAAE,EAAE,CAAC,YAAY;YAC3B,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE;YAC1C,CAAC,CAAC,SAAS,EACb,oBAAoB,EAAE,EAAE,CAAC,oBAAoB;YAC3C,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,QAAQ,EAAE;YAClD,CAAC,CAAC,SAAS,EACb,OAAO,EAAE,SAAS,EAAE,wCAAwC;QAC5D,MAAM;YACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAA,aAAI,EAAC,IAAI,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC,GACqB,CAAC;AAC3B,CAAC;AA3BD,8CA2BC;AAED,SAAgB,aAAa,CAC3B,OAA4B,EAC5B,KAAoB;IAEpB,OAAO,gCACF,OAAO,KACV,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EACjC,EAAE,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,EAC7B,WAAW,EAAE,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,EACzD,iBAAiB,EAAE,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,EACrE,iBAAiB,EAAE,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE,EACrE,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EACjD,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EACjC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,EACxD,gBAAgB,EAAE,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,EACnE,MAAM;YACJ,OAAO,IAAI,CAAC,SAAS,CAAC,IAAA,aAAI,EAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAChD,CAAC,GAC4B,CAAC;AAClC,CAAC;AAnBD,sCAmBC","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { getAddress } from '@ethersproject/address';\nimport { BigNumber } from '@ethersproject/bignumber';\nimport { Zero } from '@ethersproject/constants';\nimport {\n ApiWrapper,\n EthereumBlock,\n EthereumLog,\n EthereumReceipt,\n EthereumResult,\n EthereumTransaction,\n} from '@subql/types-ethereum';\nimport { omit } from 'lodash';\n\nexport function calcInterval(api: ApiWrapper): number {\n // TODO find a way to get this from the blockchain\n return 6000;\n}\n\nfunction handleAddress(value: string): string | null {\n if (!value || value === '0x') {\n return null;\n }\n return getAddress(value);\n}\n\nfunction handleNumber(value: string | number): BigNumber {\n if (value === undefined) {\n return Zero;\n }\n if (value === '0x') {\n return Zero;\n }\n if (value === null) {\n return Zero;\n }\n return BigNumber.from(value);\n}\n\nexport function formatBlock(block: Record<string, any>): EthereumBlock {\n return {\n ...block,\n difficulty: handleNumber(block.difficulty).toBigInt(),\n gasLimit: handleNumber(block.gasLimit).toBigInt(),\n gasUsed: handleNumber(block.gasUsed).toBigInt(),\n number: handleNumber(block.number).toNumber(),\n size: handleNumber(block.size).toBigInt(),\n timestamp: handleNumber(block.timestamp).toBigInt(),\n totalDifficulty: handleNumber(block.totalDifficulty).toBigInt(),\n baseFeePerGas: block.baseFeePerGas\n ? handleNumber(block.baseFeePerGas).toBigInt()\n : undefined,\n blockGasCost: block.blockGasCost\n ? handleNumber(block.blockGasCost).toBigInt()\n : undefined,\n logs: [], // Filled in at AvalancheBlockWrapped constructor\n } as EthereumBlock;\n}\nexport function formatLog(\n log: Omit<\n EthereumLog<EthereumResult> | EthereumLog,\n 'blockTimestamp' | 'block' | 'transaction'\n >,\n block: EthereumBlock,\n): EthereumLog<EthereumResult> | EthereumLog {\n const formattedLog = {\n ...log,\n address: handleAddress(log.address),\n blockNumber: handleNumber(log.blockNumber).toNumber(),\n transactionIndex: handleNumber(log.transactionIndex).toNumber(),\n logIndex: handleNumber(log.logIndex).toNumber(),\n block,\n toJSON(): string {\n return JSON.stringify(omit(this, ['transaction', 'block', 'toJSON']));\n },\n };\n\n // Define this afterwards as the spread on `...log` breaks defining a getter\n Object.defineProperty(formattedLog, 'transaction', {\n get: () => {\n const rawTransaction = block.transactions?.find(\n (tx) => tx.hash === log.transactionHash,\n );\n\n return rawTransaction;\n },\n });\n return formattedLog as unknown as EthereumLog<EthereumResult>;\n}\n\nexport function formatTransaction(\n tx: Record<string, any>,\n block: EthereumBlock,\n): EthereumTransaction {\n return {\n ...(tx as Partial<EthereumTransaction>),\n from: handleAddress(tx.from),\n to: handleAddress(tx.to),\n blockNumber: handleNumber(tx.blockNumber).toNumber(),\n blockTimestamp: block.timestamp,\n gas: handleNumber(tx.gas).toBigInt(),\n gasPrice: handleNumber(tx.gasPrice).toBigInt(),\n nonce: handleNumber(tx.nonce).toBigInt(),\n transactionIndex: handleNumber(tx.transactionIndex).toBigInt(),\n value: handleNumber(tx.value).toBigInt(),\n v: handleNumber(tx.v).toBigInt(),\n maxFeePerGas: tx.maxFeePerGas\n ? handleNumber(tx.maxFeePerGas).toBigInt()\n : undefined,\n maxPriorityFeePerGas: tx.maxPriorityFeePerGas\n ? handleNumber(tx.maxPriorityFeePerGas).toBigInt()\n : undefined,\n receipt: undefined, // Filled in at AvalancheApi.fetchBlocks\n toJSON(): string {\n return JSON.stringify(omit(this, ['block', 'receipt', 'toJSON']));\n },\n } as EthereumTransaction;\n}\n\nexport function formatReceipt(\n receipt: Record<string, any>,\n block: EthereumBlock,\n): EthereumReceipt {\n return {\n ...receipt,\n from: handleAddress(receipt.from),\n to: handleAddress(receipt.to),\n blockNumber: handleNumber(receipt.blockNumber).toNumber(),\n cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(),\n effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(),\n gasUsed: handleNumber(receipt.gasUsed).toBigInt(),\n logs: receipt.logs.map(formatLog),\n status: Boolean(handleNumber(receipt.status).toNumber()),\n transactionIndex: handleNumber(receipt.transactionIndex).toNumber(),\n toJSON(): string {\n return JSON.stringify(omit(this, ['toJSON']));\n },\n } as unknown as EthereumReceipt;\n}\n"]}
1
+ {"version":3,"file":"utils.ethereum.js","sourceRoot":"","sources":["../../src/ethereum/utils.ethereum.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { getAddress } from '@ethersproject/address';\nimport { BigNumber } from '@ethersproject/bignumber';\nimport { Zero } from '@ethersproject/constants';\nimport {\n ApiWrapper,\n EthereumBlock,\n EthereumLog,\n EthereumReceipt,\n EthereumResult,\n EthereumTransaction,\n} from '@subql/types-ethereum';\nimport { omit } from 'lodash';\n\nexport function calcInterval(api: ApiWrapper): number {\n // TODO find a way to get this from the blockchain\n return 6000;\n}\n\nfunction handleAddress(value: string): string | null {\n if (!value || value === '0x') {\n return null;\n }\n return getAddress(value);\n}\n\nfunction handleNumber(value: string | number): BigNumber {\n if (value === undefined) {\n return Zero;\n }\n if (value === '0x') {\n return Zero;\n }\n if (value === null) {\n return Zero;\n }\n return BigNumber.from(value);\n}\n\nexport function formatBlock(block: Record<string, any>): EthereumBlock {\n return {\n ...block,\n difficulty: handleNumber(block.difficulty).toBigInt(),\n gasLimit: handleNumber(block.gasLimit).toBigInt(),\n gasUsed: handleNumber(block.gasUsed).toBigInt(),\n number: handleNumber(block.number).toNumber(),\n size: handleNumber(block.size).toBigInt(),\n timestamp: handleNumber(block.timestamp).toBigInt(),\n totalDifficulty: handleNumber(block.totalDifficulty).toBigInt(),\n baseFeePerGas: block.baseFeePerGas\n ? handleNumber(block.baseFeePerGas).toBigInt()\n : undefined,\n blockGasCost: block.blockGasCost\n ? handleNumber(block.blockGasCost).toBigInt()\n : undefined,\n logs: [], // Filled in at AvalancheBlockWrapped constructor\n } as EthereumBlock;\n}\nexport function formatLog(\n log: Omit<\n EthereumLog<EthereumResult> | EthereumLog,\n 'blockTimestamp' | 'block' | 'transaction'\n >,\n block: EthereumBlock,\n): EthereumLog<EthereumResult> | EthereumLog {\n const formattedLog = {\n ...log,\n address: handleAddress(log.address),\n blockNumber: handleNumber(log.blockNumber).toNumber(),\n transactionIndex: handleNumber(log.transactionIndex).toNumber(),\n logIndex: handleNumber(log.logIndex).toNumber(),\n block,\n toJSON(): string {\n return JSON.stringify(omit(this, ['transaction', 'block', 'toJSON']));\n },\n };\n\n // Define this afterwards as the spread on `...log` breaks defining a getter\n Object.defineProperty(formattedLog, 'transaction', {\n get: () => {\n const rawTransaction = block.transactions?.find(\n (tx) => tx.hash === log.transactionHash,\n );\n\n return rawTransaction;\n },\n });\n return formattedLog as unknown as EthereumLog<EthereumResult>;\n}\n\nexport function formatTransaction(\n tx: Record<string, any>,\n block: EthereumBlock,\n): EthereumTransaction {\n return {\n ...(tx as Partial<EthereumTransaction>),\n from: handleAddress(tx.from),\n to: handleAddress(tx.to),\n blockNumber: handleNumber(tx.blockNumber).toNumber(),\n blockTimestamp: block.timestamp,\n gas: handleNumber(tx.gas).toBigInt(),\n gasPrice: handleNumber(tx.gasPrice).toBigInt(),\n nonce: handleNumber(tx.nonce).toBigInt(),\n transactionIndex: handleNumber(tx.transactionIndex).toBigInt(),\n value: handleNumber(tx.value).toBigInt(),\n v: handleNumber(tx.v).toBigInt(),\n maxFeePerGas: tx.maxFeePerGas\n ? handleNumber(tx.maxFeePerGas).toBigInt()\n : undefined,\n maxPriorityFeePerGas: tx.maxPriorityFeePerGas\n ? handleNumber(tx.maxPriorityFeePerGas).toBigInt()\n : undefined,\n receipt: undefined, // Filled in at AvalancheApi.fetchBlocks\n toJSON(): string {\n return JSON.stringify(omit(this, ['block', 'receipt', 'toJSON']));\n },\n } as EthereumTransaction;\n}\n\nexport function formatReceipt<R extends EthereumReceipt = EthereumReceipt>(\n receipt: Record<string, any>,\n block: EthereumBlock,\n): R {\n return {\n ...receipt,\n from: handleAddress(receipt.from),\n to: handleAddress(receipt.to),\n blockNumber: handleNumber(receipt.blockNumber).toNumber(),\n cumulativeGasUsed: handleNumber(receipt.cumulativeGasUsed).toBigInt(),\n effectiveGasPrice: handleNumber(receipt.effectiveGasPrice).toBigInt(),\n gasUsed: handleNumber(receipt.gasUsed).toBigInt(),\n logs: receipt.logs.map(formatLog),\n status: Boolean(handleNumber(receipt.status).toNumber()),\n transactionIndex: handleNumber(receipt.transactionIndex).toNumber(),\n toJSON(): string {\n return JSON.stringify(omit(this, ['toJSON']));\n },\n } as unknown as R;\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@subql/node-ethereum",
3
- "version": "3.9.1",
3
+ "version": "3.10.0",
4
4
  "description": "",
5
5
  "author": "Ian He",
6
6
  "license": "GPL-3.0",
@@ -29,7 +29,7 @@
29
29
  "@subql/common-ethereum": "3.4.1",
30
30
  "@subql/node-core": "^7.4.1",
31
31
  "@subql/testing": "^2.1.0",
32
- "@subql/types-ethereum": "3.3.1",
32
+ "@subql/types-ethereum": "3.4.0",
33
33
  "cacheable-lookup": "6",
34
34
  "cron-converter": "^1.0.2",
35
35
  "ethers": "^5.7.0",
@@ -1,7 +0,0 @@
1
- import { Networkish } from '@ethersproject/networks';
2
- import { JsonRpcBatchProvider } from '../json-rpc-batch-provider';
3
- import { ConnectionInfo } from '../web';
4
- export declare class CeloJsonRpcBatchProvider extends JsonRpcBatchProvider {
5
- private flanHardForkBlock;
6
- constructor(url?: ConnectionInfo | string, network?: Networkish);
7
- }
@@ -1,23 +0,0 @@
1
- "use strict";
2
- // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
3
- // SPDX-License-Identifier: GPL-3.0
4
- Object.defineProperty(exports, "__esModule", { value: true });
5
- exports.CeloJsonRpcBatchProvider = void 0;
6
- const node_core_1 = require("@subql/node-core");
7
- const ethers_1 = require("ethers");
8
- const json_rpc_batch_provider_1 = require("../json-rpc-batch-provider");
9
- const logger = (0, node_core_1.getLogger)('celo-batch-provider');
10
- class CeloJsonRpcBatchProvider extends json_rpc_batch_provider_1.JsonRpcBatchProvider {
11
- constructor(url, network) {
12
- super(url, network);
13
- this.flanHardForkBlock = ethers_1.BigNumber.from('16068685');
14
- const originalBlockFormatter = this.formatter._block;
15
- this.formatter._block = (value, format) => {
16
- return originalBlockFormatter(Object.assign({ gasLimit: ethers_1.BigNumber.from(value.number) < this.flanHardForkBlock
17
- ? ethers_1.constants.Zero
18
- : value.gasLimit }, value), format);
19
- };
20
- }
21
- }
22
- exports.CeloJsonRpcBatchProvider = CeloJsonRpcBatchProvider;
23
- //# sourceMappingURL=celo-json-rpc-batch-provider.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"celo-json-rpc-batch-provider.js","sourceRoot":"","sources":["../../../../src/ethereum/ethers/celo/celo-json-rpc-batch-provider.ts"],"names":[],"mappings":";AAAA,8DAA8D;AAC9D,mCAAmC;;;AAGnC,gDAA6C;AAC7C,mCAA8C;AAC9C,wEAAkE;AAGlE,MAAM,MAAM,GAAG,IAAA,qBAAS,EAAC,qBAAqB,CAAC,CAAC;AAEhD,MAAa,wBAAyB,SAAQ,8CAAoB;IAEhE,YAAY,GAA6B,EAAE,OAAoB;QAC7D,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAFd,sBAAiB,GAAG,kBAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAIrD,MAAM,sBAAsB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QACrD,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACxC,OAAO,sBAAsB,iBAEzB,QAAQ,EACN,kBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,iBAAiB;oBACnD,CAAC,CAAC,kBAAS,CAAC,IAAI;oBAChB,CAAC,CAAC,KAAK,CAAC,QAAQ,IACjB,KAAK,GAEV,MAAM,CACP,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CACF;AAnBD,4DAmBC","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { Networkish } from '@ethersproject/networks';\nimport { getLogger } from '@subql/node-core';\nimport { BigNumber, constants } from 'ethers';\nimport { JsonRpcBatchProvider } from '../json-rpc-batch-provider';\nimport { ConnectionInfo } from '../web';\n\nconst logger = getLogger('celo-batch-provider');\n\nexport class CeloJsonRpcBatchProvider extends JsonRpcBatchProvider {\n private flanHardForkBlock = BigNumber.from('16068685');\n constructor(url?: ConnectionInfo | string, network?: Networkish) {\n super(url, network);\n\n const originalBlockFormatter = this.formatter._block;\n this.formatter._block = (value, format) => {\n return originalBlockFormatter(\n {\n gasLimit:\n BigNumber.from(value.number) < this.flanHardForkBlock\n ? constants.Zero\n : value.gasLimit,\n ...value,\n },\n format,\n );\n };\n }\n}\n"]}
@@ -1,27 +0,0 @@
1
- "use strict";
2
- // Copyright 2020-2024 SubQuery Pte Ltd authors & contributors
3
- // SPDX-License-Identifier: GPL-3.0
4
- Object.defineProperty(exports, "__esModule", { value: true });
5
- const ethers_1 = require("ethers");
6
- const utils_ethereum_1 = require("../../utils.ethereum");
7
- const celo_json_rpc_batch_provider_1 = require("./celo-json-rpc-batch-provider");
8
- describe('CeloJsonRpcProvider', () => {
9
- let provider;
10
- beforeEach(() => {
11
- provider = new celo_json_rpc_batch_provider_1.CeloJsonRpcBatchProvider('https://celo.api.onfinality.io/public');
12
- });
13
- // Test if gasLimit is correctly set for blocks before the hard fork
14
- it('should set gasLimit to zero for blocks before the hard fork', async () => {
15
- const block = (0, utils_ethereum_1.formatBlock)(await provider.send('eth_getBlockByNumber', [
16
- ethers_1.utils.hexValue(16068684),
17
- true,
18
- ]));
19
- expect(ethers_1.BigNumber.from(block.gasLimit)).toEqual(ethers_1.constants.Zero);
20
- });
21
- // Test if gasLimit is correctly set for blocks after the hard fork
22
- it('should not set gasLimit to zero for blocks after the hard fork', async () => {
23
- const block = (0, utils_ethereum_1.formatBlock)(await provider.send('eth_getBlockByNumber', ['latest', true]));
24
- expect(ethers_1.BigNumber.from(block.gasLimit).gte(ethers_1.constants.Zero)).toBeTruthy();
25
- });
26
- });
27
- //# sourceMappingURL=celo-json-rpc-batch-provider.spec.js.map