cerc-io/watcher-ts
10
1
Fork 0
mirror of https://github.com/cerc-io/watcher-ts synced 2025-07-27 10:42:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fetch logs filtered by block number instead of block hash for FEVM (#504)

Browse Source 
* Fetch logs by block number for FEVM and use node-fetch for eth_getLogs

* Upgrade package versions
This commit is contained in:
Nabarun Gogoi 2024-05-02 16:04:31 +05:30 committed by GitHub
parent 67425690e9
commit edaec5a028
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 75 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -2,7 +2,7 @@
"packages": [ "packages": [
"packages/*" "packages/*"
], ],
"version": "0.2.83", "version": "0.2.84",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"command": { "command": {

2
packages/cache/package.json vendored
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/cache", "name": "@cerc-io/cache",
"version": "0.2.83", "version": "0.2.84",
"description": "Generic object cache", "description": "Generic object cache",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

12
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/cli", "name": "@cerc-io/cli",
"version": "0.2.83", "version": "0.2.84",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
@ -15,13 +15,13 @@
}, },
"dependencies": { "dependencies": {
"@apollo/client": "^3.7.1", "@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.83", "@cerc-io/cache": "^0.2.84",
"@cerc-io/ipld-eth-client": "^0.2.83", "@cerc-io/ipld-eth-client": "^0.2.84",
"@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4",
"@cerc-io/nitro-node": "^0.1.15", "@cerc-io/nitro-node": "^0.1.15",
"@cerc-io/peer": "^0.2.83", "@cerc-io/peer": "^0.2.84",
"@cerc-io/rpc-eth-client": "^0.2.83", "@cerc-io/rpc-eth-client": "^0.2.84",
"@cerc-io/util": "^0.2.83", "@cerc-io/util": "^0.2.84",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"@graphql-tools/utils": "^9.1.1", "@graphql-tools/utils": "^9.1.1",
"@ipld/dag-cbor": "^8.0.0", "@ipld/dag-cbor": "^8.0.0",

4
packages/codegen/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/codegen", "name": "@cerc-io/codegen",
"version": "0.2.83", "version": "0.2.84",
"description": "Code generator", "description": "Code generator",
"private": true, "private": true,
"main": "index.js", "main": "index.js",
@ -20,7 +20,7 @@
}, },
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@cerc-io/util": "^0.2.83", "@cerc-io/util": "^0.2.84",
"@graphql-tools/load-files": "^6.5.2", "@graphql-tools/load-files": "^6.5.2",
"@npmcli/package-json": "^5.0.0", "@npmcli/package-json": "^5.0.0",
"@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git", "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",

10
packages/codegen/src/templates/package-template.handlebars
View File

@ -41,12 +41,12 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@apollo/client": "^3.3.19", "@apollo/client": "^3.3.19",
"@cerc-io/cli": "^0.2.83", "@cerc-io/cli": "^0.2.84",
"@cerc-io/ipld-eth-client": "^0.2.83", "@cerc-io/ipld-eth-client": "^0.2.84",
"@cerc-io/solidity-mapper": "^0.2.83", "@cerc-io/solidity-mapper": "^0.2.84",
"@cerc-io/util": "^0.2.83", "@cerc-io/util": "^0.2.84",
{{#if (subgraphPath)}} {{#if (subgraphPath)}}
"@cerc-io/graph-node": "^0.2.83", "@cerc-io/graph-node": "^0.2.84",
{{/if}} {{/if}}
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1", "debug": "^4.3.1",

10
packages/graph-node/package.json
View File

@ -1,10 +1,10 @@
{ {
"name": "@cerc-io/graph-node", "name": "@cerc-io/graph-node",
"version": "0.2.83", "version": "0.2.84",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {
"@cerc-io/solidity-mapper": "^0.2.83", "@cerc-io/solidity-mapper": "^0.2.84",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"@graphprotocol/graph-ts": "^0.22.0", "@graphprotocol/graph-ts": "^0.22.0",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
@ -51,9 +51,9 @@
"dependencies": { "dependencies": {
"@apollo/client": "^3.3.19", "@apollo/client": "^3.3.19",
"@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2", "@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2",
"@cerc-io/cache": "^0.2.83", "@cerc-io/cache": "^0.2.84",
"@cerc-io/ipld-eth-client": "^0.2.83", "@cerc-io/ipld-eth-client": "^0.2.84",
"@cerc-io/util": "^0.2.83", "@cerc-io/util": "^0.2.84",
"@types/json-diff": "^0.5.2", "@types/json-diff": "^0.5.2",
"@types/yargs": "^17.0.0", "@types/yargs": "^17.0.0",
"bn.js": "^4.11.9", "bn.js": "^4.11.9",

6
packages/ipld-eth-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/ipld-eth-client", "name": "@cerc-io/ipld-eth-client",
"version": "0.2.83", "version": "0.2.84",
"description": "IPLD ETH Client", "description": "IPLD ETH Client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
@ -20,8 +20,8 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@apollo/client": "^3.7.1", "@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.83", "@cerc-io/cache": "^0.2.84",
"@cerc-io/util": "^0.2.83", "@cerc-io/util": "^0.2.84",
"cross-fetch": "^3.1.4", "cross-fetch": "^3.1.4",
"debug": "^4.3.1", "debug": "^4.3.1",
"ethers": "^5.4.4", "ethers": "^5.4.4",

2
packages/peer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/peer", "name": "@cerc-io/peer",
"version": "0.2.83", "version": "0.2.84",
"description": "libp2p module", "description": "libp2p module",
"main": "dist/index.js", "main": "dist/index.js",
"exports": "./dist/index.js", "exports": "./dist/index.js",

8
packages/rpc-eth-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/rpc-eth-client", "name": "@cerc-io/rpc-eth-client",
"version": "0.2.83", "version": "0.2.84",
"description": "RPC ETH Client", "description": "RPC ETH Client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
@ -19,9 +19,9 @@
}, },
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@cerc-io/cache": "^0.2.83", "@cerc-io/cache": "^0.2.84",
"@cerc-io/ipld-eth-client": "^0.2.83", "@cerc-io/ipld-eth-client": "^0.2.84",
"@cerc-io/util": "^0.2.83", "@cerc-io/util": "^0.2.84",
"chai": "^4.3.4", "chai": "^4.3.4",
"ethers": "^5.4.4", "ethers": "^5.4.4",
"left-pad": "^1.3.0", "left-pad": "^1.3.0",

20
packages/rpc-eth-client/src/eth-client.ts
View File

@ -4,6 +4,7 @@
import assert from 'assert'; import assert from 'assert';
import { errors, providers, utils } from 'ethers'; import { errors, providers, utils } from 'ethers';
import fetch from 'node-fetch';
import { Cache } from '@cerc-io/cache'; import { Cache } from '@cerc-io/cache';
import { encodeHeader, escapeHexString, EthClient as EthClientInterface, EthFullBlock, EthFullTransaction } from '@cerc-io/util'; import { encodeHeader, escapeHexString, EthClient as EthClientInterface, EthFullBlock, EthFullTransaction } from '@cerc-io/util';
@ -294,16 +295,23 @@ export class EthClient implements EthClientInterface {
'getLogs', 'getLogs',
vars, vars,
async () => { async () => {
const ethLogs = await this._provider.send( const response = await fetch(this._provider.connection.url, {
'eth_getLogs', method: 'POST',
[{ body: JSON.stringify({
address: addresses.map(address => address.toLowerCase()), method: 'eth_getLogs',
params: [{
addresses: addresses.map(address => address.toLowerCase()),
fromBlock: fromBlock && utils.hexValue(fromBlock), fromBlock: fromBlock && utils.hexValue(fromBlock),
toBlock: toBlock && utils.hexValue(toBlock), toBlock: toBlock && utils.hexValue(toBlock),
blockHash, blockHash,
topics topics
}] }],
); id: 1,
jsonrpc: '2.0'
})
});
const { result: ethLogs } = await response.json();
// Format raw eth_getLogs response // Format raw eth_getLogs response
const logs: providers.Log[] = providers.Formatter.arrayOf( const logs: providers.Log[] = providers.Formatter.arrayOf(

2
packages/solidity-mapper/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/solidity-mapper", "name": "@cerc-io/solidity-mapper",
"version": "0.2.83", "version": "0.2.84",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {

2
packages/test/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/test", "name": "@cerc-io/test",
"version": "0.2.83", "version": "0.2.84",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"private": true, "private": true,

2
packages/tracing-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/tracing-client", "name": "@cerc-io/tracing-client",
"version": "0.2.83", "version": "0.2.84",
"description": "ETH VM tracing client", "description": "ETH VM tracing client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

8
packages/util/package.json
View File

@ -1,13 +1,13 @@
{ {
"name": "@cerc-io/util", "name": "@cerc-io/util",
"version": "0.2.83", "version": "0.2.84",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"@apollo/utils.keyvaluecache": "^1.0.1", "@apollo/utils.keyvaluecache": "^1.0.1",
"@cerc-io/nitro-node": "^0.1.15", "@cerc-io/nitro-node": "^0.1.15",
"@cerc-io/peer": "^0.2.83", "@cerc-io/peer": "^0.2.84",
"@cerc-io/solidity-mapper": "^0.2.83", "@cerc-io/solidity-mapper": "^0.2.84",
"@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1", "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1",
"@ethersproject/properties": "^5.7.0", "@ethersproject/properties": "^5.7.0",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
@ -52,7 +52,7 @@
"yargs": "^17.0.1" "yargs": "^17.0.1"
}, },
"devDependencies": { "devDependencies": {
"@cerc-io/cache": "^0.2.83", "@cerc-io/cache": "^0.2.84",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/bunyan": "^1.8.8", "@types/bunyan": "^1.8.8",
"@types/express": "^4.17.14", "@types/express": "^4.17.14",

20
packages/util/src/indexer.ts
View File

@ -526,12 +526,28 @@ export class Indexer {
} }
async _fetchLogsAndTransactions (blockHash: string, blockNumber: number, addresses?: string[], topics?: string[][]): Promise<{ logs: any[]; transactions: EthFullTransaction[] }> { async _fetchLogsAndTransactions (blockHash: string, blockNumber: number, addresses?: string[], topics?: string[][]): Promise<{ logs: any[]; transactions: EthFullTransaction[] }> {
const { logs } = await this._ethClient.getLogs({ let logs: any[] = [];
// Get logs by block number filter in case of FEVM as block hash filter takes a long time
if (this._upstreamConfig.ethServer.isFEVM) {
assert(this._ethClient.getLogsForBlockRange, 'getLogsForBlockRange() not implemented in ethClient');
({ logs } = await this._ethClient.getLogsForBlockRange({
fromBlock: blockNumber,
toBlock: blockNumber,
addresses,
topics
}));
logs = logs.filter(log => log.blockHash === blockHash);
} else {
({ logs } = await this._ethClient.getLogs({
blockHash, blockHash,
blockNumber: blockNumber.toString(), blockNumber: blockNumber.toString(),
addresses, addresses,
topics topics
}); }));
}
const transactions = await this._fetchTxsFromLogs(logs); const transactions = await this._fetchTxsFromLogs(logs);