Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions apps/indexer-coordinator/package.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
{
"name": "@subql/indexer-coordinator",
"version": "2.10.4",
"version": "2.10.5",
"description": "",
"author": "SubQuery",
"license": "Apache-2.0",
"files": [
"/dist",
"/bin"
],
"bin": {
"indexer-coordinator": "./bin/run"
},
"bin": "./bin/run",
"scripts": {
"prebuild": "rimraf dist",
"build": "nest build && sh ./scripts/copy-resources.sh",
Expand Down Expand Up @@ -156,5 +154,9 @@
],
"coverageDirectory": "../coverage",
"testEnvironment": "node"
},
"volta": {
"node": "20.19.0",
"yarn": "1.22.22"
}
}
5 changes: 3 additions & 2 deletions apps/indexer-coordinator/src/payg/payg.query.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export class PaygQueryService {
}

@timeoutPromiseCatched(20000, undefined)
async getStateChannel(id: string): Promise<StateChannel | undefined> {
async getStateChannel(id: string): Promise<StateChannel | null | undefined> {
try {
const result = await this.client.query<GetFlexPlanQuery>({
// @ts-ignore TODO: fix type
Expand All @@ -67,8 +67,9 @@ export class PaygQueryService {
});

const channel = result.data.stateChannel;
// null: channel not found on network; undefined: request failed
// @ts-ignore TODO: fix type
return channel;
return channel ?? null;
} catch (e) {
logger.error(`Failed to get channel ${id} from Subquery Project: ${e}`);
return;
Expand Down
14 changes: 9 additions & 5 deletions apps/indexer-coordinator/src/payg/payg.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,19 @@ export class PaygService implements OnModuleInit {

async updateChannelFromNetwork(
id: string,
altChannelData?: StateChannelOnNetwork,
altChannelData?: StateChannelOnNetwork | null,
isFinal?: boolean
): Promise<Channel | undefined> {
id = BigNumber.from(id).toHexString().toLowerCase();

if (!altChannelData) {
if (altChannelData === undefined) {
altChannelData = await this.paygQueryService.getStateChannel(id);
}
if (!altChannelData) {
if (altChannelData === undefined) {
logger.debug(`State channel fetch from network failed, skip update: ${id}`);
return;
}
if (altChannelData === null) {
logger.debug(`State channel not exist on network, remove from db: ${id}`);
await this.channelRepo.delete({ id });
return;
Expand Down Expand Up @@ -265,7 +269,7 @@ export class PaygService implements OnModuleInit {
async syncChannel(
channelId: string,
altPrice?: BigNumber,
altChannelData?: StateChannelOnNetwork
altChannelData?: StateChannelOnNetwork | null
): Promise<Channel | undefined> {
if (!this.contract.getSdk()) {
return;
Expand All @@ -275,7 +279,7 @@ export class PaygService implements OnModuleInit {

const channelState = await this.channelFromContract(BigNumber.from(id));
if (!channelState) {
return this.updateChannelFromNetwork(id, altChannelData, true);
return this.updateChannelFromNetwork(id, altChannelData);
}

let channelPrice: BigNumber;
Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,9 @@
"lint-staged": "yarn lint-staged:admin && yarn lint-staged:coordinator",
"lint-staged:admin": "cd apps/indexer-admin && yarn lint-staged",
"lint-staged:coordinator": "cd apps/indexer-coordinator && yarn lint-staged"
},
"volta": {
"node": "20.19.0",
"yarn": "1.22.22"
}
}
Loading