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

Sort logs result by log index

Browse Source
This commit is contained in:
Prathamesh Musale 2024-09-18 15:27:29 +05:30
parent cbedd9ecdf
commit 3446eaece9
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/util/src/eth-rpc-handlers.ts
View File

@ -154,7 +154,13 @@ export const createEthRPCHandlers = async (
// Fetch events from the db
// Load block relation
const resultLimit = indexer.serverConfig.ethRPC.getLogsResultLimit || DEFAULT_ETH_GET_LOGS_RESULT_LIMIT;
const events = await indexer.getEvents({ where, relations: ['block'], take: resultLimit + 1 });
const events = await indexer.getEvents({
where,
relations: ['block'],
// TODO: Use querybuilder to order by block number
order: { block: 'ASC', index: 'ASC' },
take: resultLimit + 1
});
// Limit number of results can be returned by a single query
if (events.length > resultLimit) {
@ -229,7 +235,7 @@ const buildAddressFilter = (address: any, where: FindConditions<EventInterface>)
// Validate input addresses
address.forEach((add: string) => {
if (!utils.isHexString(add, 20)) {
throw new ErrorWithCode(CODE_INVALID_PARAMS, ERROR_INVALID_CONTRACT_ADDRESS);
throw new ErrorWithCode(CODE_INVALID_PARAMS, `${ERROR_INVALID_CONTRACT_ADDRESS}: expected hex string of size 20`);
}
});
@ -239,13 +245,15 @@ const buildAddressFilter = (address: any, where: FindConditions<EventInterface>)
} else {
// Validate input address
if (!utils.isHexString(address, 20)) {
throw new ErrorWithCode(CODE_INVALID_PARAMS, ERROR_INVALID_CONTRACT_ADDRESS);
throw new ErrorWithCode(CODE_INVALID_PARAMS, `${ERROR_INVALID_CONTRACT_ADDRESS}: expected hex string of size 20`);
}
where.contract = Equal(address);
}
};
type TopicColumn = 'topic0' | 'topic1' | 'topic2' | 'topic3';
const buildTopicsFilter = (topics: any, where: FindConditions<EventInterface>): void => {
// Check that topics is an array of size <= 4
if (!Array.isArray(topics)) {
@ -256,28 +264,14 @@ const buildTopicsFilter = (topics: any, where: FindConditions<EventInterface>):
throw new ErrorWithCode(CODE_INVALID_PARAMS, `${ERROR_INVALID_TOPICS}: exceeds max topics`);
}
const topicsFilterLength = topics.length;
if (topicsFilterLength > 0) {
addTopicCondition(topics[0], 'topic0', where);
}
if (topicsFilterLength > 1) {
addTopicCondition(topics[1], 'topic1', where);
}
if (topicsFilterLength > 2) {
addTopicCondition(topics[2], 'topic2', where);
}
if (topicsFilterLength > 3) {
addTopicCondition(topics[3], 'topic3', where);
for (let i = 0; i < topics.length; i++) {
addTopicCondition(topics[i], `topic${i}` as TopicColumn, where);
}
};
const addTopicCondition = (
topicFilter: string[] | string,
topicIndex: 'topic0' | 'topic1' | 'topic2' | 'topic3',
topicIndex: TopicColumn,
where: FindConditions<EventInterface>
): any => {
if (Array.isArray(topicFilter)) {

1
packages/util/src/server.ts
View File

@ -103,6 +103,7 @@ export const createAndStartServer = async (
});
const rpcPath = serverConfig.ethRPC?.path ?? DEFAULT_ETH_RPC_PATH;
if (serverConfig.ethRPC?.enabled) {
// Create a JSON-RPC server to handle ETH RPC calls
const rpcServer = jayson.Server(ethRPCHandlers);