deep-stack/azimuth-watcher-ts
7
0
Fork 0
forked from LaconicNetwork/azimuth-watcher-ts
Code Pull Requests Activity

Update watchers to add event name filter in eventsInRange GQL query (#50)

Browse Source 
* Update azimuth-watcher with latest watcher-ts version

* Update all watchers for event name filter

* Upgrade package version
This commit is contained in:
Nabarun Gogoi 2025-03-20 21:20:32 +05:30 committed by GitHub
parent 4927f2fba6
commit 53be2a87c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
43 changed files with 140 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -3,6 +3,6 @@
"packages/*"
],
"useWorkspaces": true,
"version": "0.1.7",
"version": "0.1.8",
"npmClient": "yarn"
}

10
packages/azimuth-watcher/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/azimuth-watcher",
"version": "0.1.7",
"version": "0.1.8",
"description": "azimuth-watcher",
"private": true,
"main": "dist/index.js",
@ -39,10 +39,10 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "0.2.98-patch.1",
"@cerc-io/ipld-eth-client": "0.2.98-patch.1",
"@cerc-io/solidity-mapper": "0.2.98-patch.1",
"@cerc-io/util": "0.2.98-patch.1",
"@cerc-io/cli": "0.2.98-patch.2",
"@cerc-io/ipld-eth-client": "0.2.98-patch.2",
"@cerc-io/solidity-mapper": "0.2.98-patch.2",
"@cerc-io/util": "0.2.98-patch.2",
"@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1",
"decimal.js": "^10.3.1",

4
packages/azimuth-watcher/src/database.ts
View File

@ -852,10 +852,10 @@ export class Database implements DatabaseInterface {
return this._baseDatabase.getProcessedBlockCountForRange(repo, fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
const repo = this._conn.getRepository(Event);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber, name);
}
async saveEventEntity (queryRunner: QueryRunner, entity: Event): Promise<Event> {

4
packages/azimuth-watcher/src/indexer.ts
View File

@ -1733,8 +1733,8 @@ export class Indexer implements IndexerInterface {
return this._baseIndexer.getProcessedBlockCountForRange(fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange);
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange, name);
}
async getSyncStatus (): Promise<SyncStatus | undefined> {

6
packages/azimuth-watcher/src/resolvers.ts
View File

@ -1103,10 +1103,10 @@ export const createResolvers = async (
eventsInRange: async (
_: any,
{ fromBlockNumber, toBlockNumber }: { fromBlockNumber: number, toBlockNumber: number },
{ fromBlockNumber, toBlockNumber, name }: { fromBlockNumber: number, toBlockNumber: number, name?: string },
expressContext: ExpressContext
) => {
log('eventsInRange', fromBlockNumber, toBlockNumber);
log('eventsInRange', fromBlockNumber, toBlockNumber, name);
return executeAndRecordMetrics(
indexer,
@ -1124,7 +1124,7 @@ export const createResolvers = async (
throw new Error(`Block range should be between ${syncStatus.initialIndexedBlockNumber} and ${syncStatus.latestProcessedBlockNumber}`);
}
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber);
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber, name);
return events.map(event => indexer.getResultEvent(event));
}
);

2
packages/azimuth-watcher/src/schema.gql
View File

@ -176,7 +176,7 @@ type SyncStatus {
type Query {
events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!, name: String): [ResultEvent!]
isActive(blockHash: String!, contractAddress: String!, _point: BigInt!): ResultBoolean!
getKeys(blockHash: String!, contractAddress: String!, _point: BigInt!): ResultGetKeysType!
getKeyRevisionNumber(blockHash: String!, contractAddress: String!, _point: BigInt!): ResultBigInt!

10
packages/censures-watcher/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/censures-watcher",
"version": "0.1.7",
"version": "0.1.8",
"description": "censures-watcher",
"private": true,
"main": "dist/index.js",
@ -39,10 +39,10 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "0.2.98-patch.1",
"@cerc-io/ipld-eth-client": "0.2.98-patch.1",
"@cerc-io/solidity-mapper": "0.2.98-patch.1",
"@cerc-io/util": "0.2.98-patch.1",
"@cerc-io/cli": "0.2.98-patch.2",
"@cerc-io/ipld-eth-client": "0.2.98-patch.2",
"@cerc-io/solidity-mapper": "0.2.98-patch.2",
"@cerc-io/util": "0.2.98-patch.2",
"@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1",
"decimal.js": "^10.3.1",

4
packages/censures-watcher/src/database.ts
View File

@ -199,10 +199,10 @@ export class Database implements DatabaseInterface {
return this._baseDatabase.getProcessedBlockCountForRange(repo, fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
const repo = this._conn.getRepository(Event);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber, name);
}
async saveEventEntity (queryRunner: QueryRunner, entity: Event): Promise<Event> {

4
packages/censures-watcher/src/indexer.ts
View File

@ -511,8 +511,8 @@ export class Indexer implements IndexerInterface {
return this._baseIndexer.getProcessedBlockCountForRange(fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange);
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange, name);
}
async getSyncStatus (): Promise<SyncStatus | undefined> {

6
packages/censures-watcher/src/resolvers.ts
View File

@ -223,10 +223,10 @@ export const createResolvers = async (
eventsInRange: async (
_: any,
{ fromBlockNumber, toBlockNumber }: { fromBlockNumber: number, toBlockNumber: number },
{ fromBlockNumber, toBlockNumber, name }: { fromBlockNumber: number, toBlockNumber: number, name?: string },
expressContext: ExpressContext
) => {
log('eventsInRange', fromBlockNumber, toBlockNumber);
log('eventsInRange', fromBlockNumber, toBlockNumber, name);
return executeAndRecordMetrics(
indexer,
@ -244,7 +244,7 @@ export const createResolvers = async (
throw new Error(`Block range should be between ${syncStatus.initialIndexedBlockNumber} and ${syncStatus.latestProcessedBlockNumber}`);
}
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber);
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber, name);
return events.map(event => indexer.getResultEvent(event));
}
);

2
packages/censures-watcher/src/schema.gql
View File

@ -87,7 +87,7 @@ type SyncStatus {
type Query {
events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!, name: String): [ResultEvent!]
getCensuringCount(blockHash: String!, contractAddress: String!, _whose: Int!): ResultBigInt!
getCensuring(blockHash: String!, contractAddress: String!, _whose: Int!): ResultBigIntArray!
getCensuredByCount(blockHash: String!, contractAddress: String!, _who: Int!): ResultBigInt!

10
packages/claims-watcher/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/claims-watcher",
"version": "0.1.7",
"version": "0.1.8",
"description": "claims-watcher",
"private": true,
"main": "dist/index.js",
@ -39,10 +39,10 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "0.2.98-patch.1",
"@cerc-io/ipld-eth-client": "0.2.98-patch.1",
"@cerc-io/solidity-mapper": "0.2.98-patch.1",
"@cerc-io/util": "0.2.98-patch.1",
"@cerc-io/cli": "0.2.98-patch.2",
"@cerc-io/ipld-eth-client": "0.2.98-patch.2",
"@cerc-io/solidity-mapper": "0.2.98-patch.2",
"@cerc-io/util": "0.2.98-patch.2",
"@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1",
"decimal.js": "^10.3.1",

4
packages/claims-watcher/src/database.ts
View File

@ -153,10 +153,10 @@ export class Database implements DatabaseInterface {
return this._baseDatabase.getProcessedBlockCountForRange(repo, fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
const repo = this._conn.getRepository(Event);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber, name);
}
async saveEventEntity (queryRunner: QueryRunner, entity: Event): Promise<Event> {

4
packages/claims-watcher/src/indexer.ts
View File

@ -419,8 +419,8 @@ export class Indexer implements IndexerInterface {
return this._baseIndexer.getProcessedBlockCountForRange(fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange);
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange, name);
}
async getSyncStatus (): Promise<SyncStatus | undefined> {

6
packages/claims-watcher/src/resolvers.ts
View File

@ -157,10 +157,10 @@ export const createResolvers = async (
eventsInRange: async (
_: any,
{ fromBlockNumber, toBlockNumber }: { fromBlockNumber: number, toBlockNumber: number },
{ fromBlockNumber, toBlockNumber, name }: { fromBlockNumber: number, toBlockNumber: number, name?: string },
expressContext: ExpressContext
) => {
log('eventsInRange', fromBlockNumber, toBlockNumber);
log('eventsInRange', fromBlockNumber, toBlockNumber, name);
return executeAndRecordMetrics(
indexer,
@ -178,7 +178,7 @@ export const createResolvers = async (
throw new Error(`Block range should be between ${syncStatus.initialIndexedBlockNumber} and ${syncStatus.latestProcessedBlockNumber}`);
}
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber);
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber, name);
return events.map(event => indexer.getResultEvent(event));
}
);

2
packages/claims-watcher/src/schema.gql
View File

@ -80,7 +80,7 @@ type SyncStatus {
type Query {
events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!, name: String): [ResultEvent!]
findClaim(blockHash: String!, contractAddress: String!, _whose: BigInt!, _protocol: String!, _claim: String!): ResultInt!
getStateByCID(cid: String!): ResultState
getState(blockHash: String!, contractAddress: String!, kind: String): ResultState

10
packages/conditional-star-release-watcher/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/conditional-star-release-watcher",
"version": "0.1.7",
"version": "0.1.8",
"description": "conditional-star-release-watcher",
"private": true,
"main": "dist/index.js",
@ -39,10 +39,10 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "0.2.98-patch.1",
"@cerc-io/ipld-eth-client": "0.2.98-patch.1",
"@cerc-io/solidity-mapper": "0.2.98-patch.1",
"@cerc-io/util": "0.2.98-patch.1",
"@cerc-io/cli": "0.2.98-patch.2",
"@cerc-io/ipld-eth-client": "0.2.98-patch.2",
"@cerc-io/solidity-mapper": "0.2.98-patch.2",
"@cerc-io/util": "0.2.98-patch.2",
"@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1",
"decimal.js": "^10.3.1",

4
packages/conditional-star-release-watcher/src/database.ts
View File

@ -298,10 +298,10 @@ export class Database implements DatabaseInterface {
return this._baseDatabase.getProcessedBlockCountForRange(repo, fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
const repo = this._conn.getRepository(Event);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber, name);
}
async saveEventEntity (queryRunner: QueryRunner, entity: Event): Promise<Event> {

4
packages/conditional-star-release-watcher/src/indexer.ts
View File

@ -700,8 +700,8 @@ export class Indexer implements IndexerInterface {
return this._baseIndexer.getProcessedBlockCountForRange(fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange);
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange, name);
}
async getSyncStatus (): Promise<SyncStatus | undefined> {

6
packages/conditional-star-release-watcher/src/resolvers.ts
View File

@ -355,10 +355,10 @@ export const createResolvers = async (
eventsInRange: async (
_: any,
{ fromBlockNumber, toBlockNumber }: { fromBlockNumber: number, toBlockNumber: number },
{ fromBlockNumber, toBlockNumber, name }: { fromBlockNumber: number, toBlockNumber: number, name?: string },
expressContext: ExpressContext
) => {
log('eventsInRange', fromBlockNumber, toBlockNumber);
log('eventsInRange', fromBlockNumber, toBlockNumber, name);
return executeAndRecordMetrics(
indexer,
@ -376,7 +376,7 @@ export const createResolvers = async (
throw new Error(`Block range should be between ${syncStatus.initialIndexedBlockNumber} and ${syncStatus.latestProcessedBlockNumber}`);
}
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber);
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber, name);
return events.map(event => indexer.getResultEvent(event));
}
);

2
packages/conditional-star-release-watcher/src/schema.gql
View File

@ -114,7 +114,7 @@ type SyncStatus {
type Query {
events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!, name: String): [ResultEvent!]
withdrawLimit(blockHash: String!, contractAddress: String!, _participant: String!, _batch: Int!): ResultInt!
verifyBalance(blockHash: String!, contractAddress: String!, _participant: String!): ResultBoolean!
getBatches(blockHash: String!, contractAddress: String!, _participant: String!): ResultIntArray!

10
packages/delegated-sending-watcher/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/delegated-sending-watcher",
"version": "0.1.7",
"version": "0.1.8",
"description": "delegated-sending-watcher",
"private": true,
"main": "dist/index.js",
@ -39,10 +39,10 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "0.2.98-patch.1",
"@cerc-io/ipld-eth-client": "0.2.98-patch.1",
"@cerc-io/solidity-mapper": "0.2.98-patch.1",
"@cerc-io/util": "0.2.98-patch.1",
"@cerc-io/cli": "0.2.98-patch.2",
"@cerc-io/ipld-eth-client": "0.2.98-patch.2",
"@cerc-io/solidity-mapper": "0.2.98-patch.2",
"@cerc-io/util": "0.2.98-patch.2",
"@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1",
"decimal.js": "^10.3.1",

4
packages/delegated-sending-watcher/src/database.ts
View File

@ -168,10 +168,10 @@ export class Database implements DatabaseInterface {
return this._baseDatabase.getProcessedBlockCountForRange(repo, fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
const repo = this._conn.getRepository(Event);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber, name);
}
async saveEventEntity (queryRunner: QueryRunner, entity: Event): Promise<Event> {

4
packages/delegated-sending-watcher/src/indexer.ts
View File

@ -449,8 +449,8 @@ export class Indexer implements IndexerInterface {
return this._baseIndexer.getProcessedBlockCountForRange(fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange);
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange, name);
}
async getSyncStatus (): Promise<SyncStatus | undefined> {

6
packages/delegated-sending-watcher/src/resolvers.ts
View File

@ -179,10 +179,10 @@ export const createResolvers = async (
eventsInRange: async (
_: any,
{ fromBlockNumber, toBlockNumber }: { fromBlockNumber: number, toBlockNumber: number },
{ fromBlockNumber, toBlockNumber, name }: { fromBlockNumber: number, toBlockNumber: number, name?: string },
expressContext: ExpressContext
) => {
log('eventsInRange', fromBlockNumber, toBlockNumber);
log('eventsInRange', fromBlockNumber, toBlockNumber, name);
return executeAndRecordMetrics(
indexer,
@ -200,7 +200,7 @@ export const createResolvers = async (
throw new Error(`Block range should be between ${syncStatus.initialIndexedBlockNumber} and ${syncStatus.latestProcessedBlockNumber}`);
}
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber);
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber, name);
return events.map(event => indexer.getResultEvent(event));
}
);

2
packages/delegated-sending-watcher/src/schema.gql
View File

@ -75,7 +75,7 @@ type SyncStatus {
type Query {
events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!, name: String): [ResultEvent!]
canSend(blockHash: String!, contractAddress: String!, _as: BigInt!, _point: BigInt!): ResultBoolean!
canReceive(blockHash: String!, contractAddress: String!, _recipient: String!): ResultBoolean!
getStateByCID(cid: String!): ResultState

10
packages/ecliptic-watcher/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/ecliptic-watcher",
"version": "0.1.7",
"version": "0.1.8",
"description": "ecliptic-watcher",
"private": true,
"main": "dist/index.js",
@ -39,10 +39,10 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "0.2.98-patch.1",
"@cerc-io/ipld-eth-client": "0.2.98-patch.1",
"@cerc-io/solidity-mapper": "0.2.98-patch.1",
"@cerc-io/util": "0.2.98-patch.1",
"@cerc-io/cli": "0.2.98-patch.2",
"@cerc-io/ipld-eth-client": "0.2.98-patch.2",
"@cerc-io/solidity-mapper": "0.2.98-patch.2",
"@cerc-io/util": "0.2.98-patch.2",
"@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1",
"decimal.js": "^10.3.1",

5
packages/ecliptic-watcher/src/database.ts
View File

@ -314,10 +314,9 @@ export class Database implements DatabaseInterface {
return this._baseDatabase.getProcessedBlockCountForRange(repo, fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
const repo = this._conn.getRepository(Event);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber, name);
}
async saveEventEntity (queryRunner: QueryRunner, entity: Event): Promise<Event> {

4
packages/ecliptic-watcher/src/indexer.ts
View File

@ -721,8 +721,8 @@ export class Indexer implements IndexerInterface {
return this._baseIndexer.getProcessedBlockCountForRange(fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange);
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange, name);
}
async getSyncStatus (): Promise<SyncStatus | undefined> {

6
packages/ecliptic-watcher/src/resolvers.ts
View File

@ -377,10 +377,10 @@ export const createResolvers = async (
eventsInRange: async (
_: any,
{ fromBlockNumber, toBlockNumber }: { fromBlockNumber: number, toBlockNumber: number },
{ fromBlockNumber, toBlockNumber, name }: { fromBlockNumber: number, toBlockNumber: number, name?: string },
expressContext: ExpressContext
) => {
log('eventsInRange', fromBlockNumber, toBlockNumber);
log('eventsInRange', fromBlockNumber, toBlockNumber, name);
return executeAndRecordMetrics(
indexer,
@ -398,7 +398,7 @@ export const createResolvers = async (
throw new Error(`Block range should be between ${syncStatus.initialIndexedBlockNumber} and ${syncStatus.latestProcessedBlockNumber}`);
}
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber);
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber, name);
return events.map(event => indexer.getResultEvent(event));
}
);

2
packages/ecliptic-watcher/src/schema.gql
View File

@ -108,7 +108,7 @@ type SyncStatus {
type Query {
events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!, name: String): [ResultEvent!]
supportsInterface(blockHash: String!, contractAddress: String!, _interfaceId: String!): ResultBoolean!
name(blockHash: String!, contractAddress: String!): ResultString!
symbol(blockHash: String!, contractAddress: String!): ResultString!

2
packages/gateway-server/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/gateway-server",
"version": "0.1.7",
"version": "0.1.8",
"main": "index.js",
"license": "AGPL-3.0",
"private": true,

10
packages/linear-star-release-watcher/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/linear-star-release-watcher",
"version": "0.1.7",
"version": "0.1.8",
"description": "linear-star-release-watcher",
"private": true,
"main": "dist/index.js",
@ -39,10 +39,10 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "0.2.98-patch.1",
"@cerc-io/ipld-eth-client": "0.2.98-patch.1",
"@cerc-io/solidity-mapper": "0.2.98-patch.1",
"@cerc-io/util": "0.2.98-patch.1",
"@cerc-io/cli": "0.2.98-patch.2",
"@cerc-io/ipld-eth-client": "0.2.98-patch.2",
"@cerc-io/solidity-mapper": "0.2.98-patch.2",
"@cerc-io/util": "0.2.98-patch.2",
"@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1",
"decimal.js": "^10.3.1",

4
packages/linear-star-release-watcher/src/database.ts
View File

@ -183,10 +183,10 @@ export class Database implements DatabaseInterface {
return this._baseDatabase.getProcessedBlockCountForRange(repo, fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
const repo = this._conn.getRepository(Event);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber, name);
}
async saveEventEntity (queryRunner: QueryRunner, entity: Event): Promise<Event> {

4
packages/linear-star-release-watcher/src/indexer.ts
View File

@ -479,8 +479,8 @@ export class Indexer implements IndexerInterface {
return this._baseIndexer.getProcessedBlockCountForRange(fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange);
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange, name);
}
async getSyncStatus (): Promise<SyncStatus | undefined> {

6
packages/linear-star-release-watcher/src/resolvers.ts
View File

@ -201,10 +201,10 @@ export const createResolvers = async (
eventsInRange: async (
_: any,
{ fromBlockNumber, toBlockNumber }: { fromBlockNumber: number, toBlockNumber: number },
{ fromBlockNumber, toBlockNumber, name }: { fromBlockNumber: number, toBlockNumber: number, name?: string },
expressContext: ExpressContext
) => {
log('eventsInRange', fromBlockNumber, toBlockNumber);
log('eventsInRange', fromBlockNumber, toBlockNumber, name);
return executeAndRecordMetrics(
indexer,
@ -222,7 +222,7 @@ export const createResolvers = async (
throw new Error(`Block range should be between ${syncStatus.initialIndexedBlockNumber} and ${syncStatus.latestProcessedBlockNumber}`);
}
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber);
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber, name);
return events.map(event => indexer.getResultEvent(event));
}
);

2
packages/linear-star-release-watcher/src/schema.gql
View File

@ -86,7 +86,7 @@ type SyncStatus {
type Query {
events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!, name: String): [ResultEvent!]
withdrawLimit(blockHash: String!, contractAddress: String!, _participant: String!): ResultInt!
verifyBalance(blockHash: String!, contractAddress: String!, _participant: String!): ResultBoolean!
getRemainingStars(blockHash: String!, contractAddress: String!, _participant: String!): ResultIntArray!

10
packages/polls-watcher/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/polls-watcher",
"version": "0.1.7",
"version": "0.1.8",
"description": "polls-watcher",
"private": true,
"main": "dist/index.js",
@ -39,10 +39,10 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "0.2.98-patch.1",
"@cerc-io/ipld-eth-client": "0.2.98-patch.1",
"@cerc-io/solidity-mapper": "0.2.98-patch.1",
"@cerc-io/util": "0.2.98-patch.1",
"@cerc-io/cli": "0.2.98-patch.2",
"@cerc-io/ipld-eth-client": "0.2.98-patch.2",
"@cerc-io/solidity-mapper": "0.2.98-patch.2",
"@cerc-io/util": "0.2.98-patch.2",
"@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1",
"decimal.js": "^10.3.1",

4
packages/polls-watcher/src/database.ts
View File

@ -244,10 +244,10 @@ export class Database implements DatabaseInterface {
return this._baseDatabase.getProcessedBlockCountForRange(repo, fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
const repo = this._conn.getRepository(Event);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber);
return this._baseDatabase.getEventsInRange(repo, fromBlockNumber, toBlockNumber, name);
}
async saveEventEntity (queryRunner: QueryRunner, entity: Event): Promise<Event> {

4
packages/polls-watcher/src/indexer.ts
View File

@ -601,8 +601,8 @@ export class Indexer implements IndexerInterface {
return this._baseIndexer.getProcessedBlockCountForRange(fromBlockNumber, toBlockNumber);
}
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange);
async getEventsInRange (fromBlockNumber: number, toBlockNumber: number, name?: string): Promise<Array<Event>> {
return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.gql.maxEventsBlockRange, name);
}
async getSyncStatus (): Promise<SyncStatus | undefined> {

6
packages/polls-watcher/src/resolvers.ts
View File

@ -289,10 +289,10 @@ export const createResolvers = async (
eventsInRange: async (
_: any,
{ fromBlockNumber, toBlockNumber }: { fromBlockNumber: number, toBlockNumber: number },
{ fromBlockNumber, toBlockNumber, name }: { fromBlockNumber: number, toBlockNumber: number, name?: string },
expressContext: ExpressContext
) => {
log('eventsInRange', fromBlockNumber, toBlockNumber);
log('eventsInRange', fromBlockNumber, toBlockNumber, name);
return executeAndRecordMetrics(
indexer,
@ -310,7 +310,7 @@ export const createResolvers = async (
throw new Error(`Block range should be between ${syncStatus.initialIndexedBlockNumber} and ${syncStatus.latestProcessedBlockNumber}`);
}
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber);
const events = await indexer.getEventsInRange(fromBlockNumber, toBlockNumber, name);
return events.map(event => indexer.getResultEvent(event));
}
);

2
packages/polls-watcher/src/schema.gql
View File

@ -102,7 +102,7 @@ type SyncStatus {
type Query {
events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!, name: String): [ResultEvent!]
getUpgradeProposals(blockHash: String!, contractAddress: String!): ResultStringArray!
getUpgradeProposalCount(blockHash: String!, contractAddress: String!): ResultBigInt!
getDocumentProposals(blockHash: String!, contractAddress: String!): ResultStringArray!

68
yarn.lock
View File

@ -206,10 +206,10 @@
js-tokens "^4.0.0"
picocolors "^1.0.0"
"@cerc-io/cache@^0.2.98-patch.1":
version "0.2.98-patch.1"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.98-patch.1/cache-0.2.98-patch.1.tgz#1b61a5e2ec7cc88fda1a80c10c27aeedf41210a1"
integrity sha512-zVSwz9duEADuy5DmMX1USy2Xvk+tKRApakK/H0MGmZhikmupurRETeONV9/Dh5g5k+7wOgIRagw1lGbQR/Yvbg==
"@cerc-io/cache@^0.2.98-patch.2":
version "0.2.98-patch.2"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.98-patch.2/cache-0.2.98-patch.2.tgz#2be752e92aa42cc7c57ade5387fe950832d1e39a"
integrity sha512-0KkK+UsC9iBPt23iD1n8CRS5anp9JHeAy2K5/fHLmFccc58rC6jNi2J/U+mDQ3AkeojlqMvDkQc4w071der/Gw==
dependencies:
canonical-json "^0.0.4"
debug "^4.3.1"
@ -217,19 +217,19 @@
fs-extra "^10.0.0"
level "^7.0.0"
"@cerc-io/cli@0.2.98-patch.1":
version "0.2.98-patch.1"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.98-patch.1/cli-0.2.98-patch.1.tgz#d8fb7b24114c7f21feb9991ae8817f7f2d6d3cd1"
integrity sha512-ImOjbJGiZn50AgQ51JzsJvx43QATxeoGTDSA3PifpYFipm7IexRtoXQLwMCr9y1jt7ZF9hlP4Mq9XeI4kMZeYw==
"@cerc-io/cli@0.2.98-patch.2":
version "0.2.98-patch.2"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.98-patch.2/cli-0.2.98-patch.2.tgz#56e2130a40cd748cd7f045d66393e836cb2b3583"
integrity sha512-o3+Ryp0T/6TShd5gKFFtt67wBamtBpK0Ci/c87Yf8RiB7jPsXOILLvigJkhQWhnldvfCULyjWriy5L4dZ/j99w==
dependencies:
"@apollo/client" "^3.7.1"
"@cerc-io/cache" "^0.2.98-patch.1"
"@cerc-io/ipld-eth-client" "^0.2.98-patch.1"
"@cerc-io/cache" "^0.2.98-patch.2"
"@cerc-io/ipld-eth-client" "^0.2.98-patch.2"
"@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
"@cerc-io/nitro-node" "^0.1.15"
"@cerc-io/peer" "0.2.98"
"@cerc-io/rpc-eth-client" "^0.2.98-patch.1"
"@cerc-io/util" "^0.2.98-patch.1"
"@cerc-io/rpc-eth-client" "^0.2.98-patch.2"
"@cerc-io/util" "^0.2.98-patch.2"
"@ethersproject/providers" "^5.4.4"
"@graphql-tools/utils" "^9.1.1"
"@ipld/dag-cbor" "^8.0.0"
@ -250,14 +250,14 @@
typeorm "0.2.37"
yargs "^17.0.1"
"@cerc-io/ipld-eth-client@0.2.98-patch.1", "@cerc-io/ipld-eth-client@^0.2.98-patch.1":
version "0.2.98-patch.1"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.98-patch.1/ipld-eth-client-0.2.98-patch.1.tgz#1a7aa59212e2a985a2728cdd7021fed91ffe4274"
integrity sha512-YEVtQ4HO7Ib5mcKBwBUE0wIsWhpB5KLvS/VtzP7O6QYjfX1W8DRqwmF1gUYt5NXeJdexxPNp3lF0eTsAIOigCA==
"@cerc-io/ipld-eth-client@0.2.98-patch.2", "@cerc-io/ipld-eth-client@^0.2.98-patch.2":
version "0.2.98-patch.2"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.98-patch.2/ipld-eth-client-0.2.98-patch.2.tgz#88feb90ff67dc6c4fa31f7bac64b34276b7aeccb"
integrity sha512-Dh4IcQHkIvxGotXS/WqUzADfP9W8eZqGyaoKGlSYMNnFLgU5CL8Atag4yhfiKqqMZX1qO4QEoAFQ0ABIh8KhSw==
dependencies:
"@apollo/client" "^3.7.1"
"@cerc-io/cache" "^0.2.98-patch.1"
"@cerc-io/util" "^0.2.98-patch.1"
"@cerc-io/cache" "^0.2.98-patch.2"
"@cerc-io/util" "^0.2.98-patch.2"
cross-fetch "^3.1.4"
debug "^4.3.1"
ethers "^5.4.4"
@ -452,23 +452,23 @@
it-stream-types "^1.0.4"
promjs "^0.4.2"
"@cerc-io/rpc-eth-client@^0.2.98-patch.1":
version "0.2.98-patch.1"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.98-patch.1/rpc-eth-client-0.2.98-patch.1.tgz#685541840705eff51fd7d155bb1cebe1751c0647"
integrity sha512-c8tJfv115DIlSS0/Nedhk2555uYi/T2mfp139sNCYuKMBO5khHapeMCQ/IfOQXHg944yZhfvUaT2zp9YBZR4Zg==
"@cerc-io/rpc-eth-client@^0.2.98-patch.2":
version "0.2.98-patch.2"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.98-patch.2/rpc-eth-client-0.2.98-patch.2.tgz#11499c754ec25b0705b102ae5cbf6cd4b81d9c3b"
integrity sha512-7VNuWLt82yoBsTk5Nz8LWuCZiqZ6WjsFWIK+9lAnRoHHrt7ojLq7LGTrzRlTFtkqt8DzwvHv5ktDOs2NuZHH8w==
dependencies:
"@cerc-io/cache" "^0.2.98-patch.1"
"@cerc-io/ipld-eth-client" "^0.2.98-patch.1"
"@cerc-io/util" "^0.2.98-patch.1"
"@cerc-io/cache" "^0.2.98-patch.2"
"@cerc-io/ipld-eth-client" "^0.2.98-patch.2"
"@cerc-io/util" "^0.2.98-patch.2"
chai "^4.3.4"
ethers "^5.4.4"
left-pad "^1.3.0"
mocha "^8.4.0"
"@cerc-io/solidity-mapper@0.2.98-patch.1", "@cerc-io/solidity-mapper@^0.2.98-patch.1":
version "0.2.98-patch.1"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.98-patch.1/solidity-mapper-0.2.98-patch.1.tgz#cfc46c956ebf2b244a1cc34f1ed6b5d529f3c927"
integrity sha512-x7WlyCfGWR5px8k0CSYzdZHJRGBo/ZBwEYHpYko/syD/owsh+rdKN0oX3Om7nySjrs9NukzjF32/eAgzSiBKsw==
"@cerc-io/solidity-mapper@0.2.98-patch.2", "@cerc-io/solidity-mapper@^0.2.98-patch.2":
version "0.2.98-patch.2"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.98-patch.2/solidity-mapper-0.2.98-patch.2.tgz#6b82c09cc891cc47c56d00705d83039e65a84aee"
integrity sha512-sSxLfM+xuDJwGbW2ztho0Xog6XOMe9b7Z+XMOQT/PVpNhBUNiRZ9j5TnPrbKnCC8N132pVApo0FHzgROQYznbg==
dependencies:
dotenv "^10.0.0"
@ -477,15 +477,15 @@
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fts-channel/-/1.0.3-ts-nitro-0.1.1/ts-channel-1.0.3-ts-nitro-0.1.1.tgz#0768781313a167295c0bf21307f47e02dc17e936"
integrity sha512-2jFICUSyffuZ+8+qRhXuLSJq4GJ6Y02wxiXoubH0Kzv2lIKkJtWICY1ZQQhtXAvP0ncAQB85WJHqtqwH8l7J3Q==
"@cerc-io/util@0.2.98-patch.1", "@cerc-io/util@^0.2.98-patch.1":
version "0.2.98-patch.1"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.98-patch.1/util-0.2.98-patch.1.tgz#4ba17d25397243b42368a2d8f526bb1c306eda20"
integrity sha512-4qK+JvziRdrzsP21dGSAC2aMjBMBZUtaajyQWDy9kjyKv/crxfTLuEy3oRvXButvKow/ZzFuTmXoKmQ7TPfeew==
"@cerc-io/util@0.2.98-patch.2", "@cerc-io/util@^0.2.98-patch.2":
version "0.2.98-patch.2"
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.98-patch.2/util-0.2.98-patch.2.tgz#f306d4087b55f87ac16731544a19fe482454eb20"
integrity sha512-oYjH7n+2ivf6/chDFRgAuwXeQk2ZW/ZnVWVzHMf9avQIdVLoQF7XU8fpfckKTHbMPek4yV8C+Mb3EmKwREpopQ==
dependencies:
"@apollo/utils.keyvaluecache" "^1.0.1"
"@cerc-io/nitro-node" "^0.1.15"
"@cerc-io/peer" "0.2.98"
"@cerc-io/solidity-mapper" "^0.2.98-patch.1"
"@cerc-io/solidity-mapper" "^0.2.98-patch.2"
"@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
"@ethersproject/properties" "^5.7.0"
"@ethersproject/providers" "^5.4.4"